Index: openacs-4/etc/install/checkout.sh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/install/checkout.sh,v
diff -u -r1.2 -r1.3
--- openacs-4/etc/install/checkout.sh	5 Sep 2003 07:37:09 -0000	1.2
+++ openacs-4/etc/install/checkout.sh	5 Sep 2003 07:40:05 -0000	1.3
@@ -7,12 +7,9 @@
 # This script should be executed as root and requires the following
 # environment variables to be set:
 #
-# config_file - where variables such as the server_path are kept
+# config_file - where variables such as the serverroot are kept
 # dotlrn - (yes or no) Indicates if dotlrn should be checked out
 #
-# environment variable to be set. It is based on instructions 
-# at http://dotlrn.openforce.net/dotlrn/doc/dotlrn-install
-#
 # @author Peter Marklund (peter@collaboraid.biz)
 
 export CVS_RSH=ssh
@@ -26,13 +23,13 @@
 source functions.sh
 
 # Fetch config parameters
-server_path=`get_config_param server_path`
+serverroot=`get_config_param serverroot`
 start_server_command=`get_config_param start_server_command`
 pre_checkout_script=`get_config_param pre_checkout_script`
 post_checkout_script=`get_config_param post_checkout_script`
 use_timesaver_files=`get_config_param use_timesaver_files`
 
-echo "$0: Starting checkout for server path $server_path with config_file $config_file and dotlrn=$dotlrn"
+echo "$0: Starting checkout for server path $serverroot with config_file $config_file and dotlrn=$dotlrn"
 
 # The idea of this script is to move away any files or changes
 # to the source tree that we want to keep (for example an
@@ -42,37 +39,37 @@
 fi
 
 # Move away the old sources
-if [ -d ${server_path} ]; then
+if [ -d ${serverroot} ]; then
 
   # Remove old tmp storage of sources
-  server_name=$(basename ${server_path})
+  server_name=$(basename ${serverroot})
   old_sources_path="/tmp/${server_name}"
   if [ -d ${old_sources_path} ]; then
     echo "$0: removing old server sources at ${old_sources_path}"
     rm -rf ${old_sources_path}
   fi
  
-  echo "$0: Moving sources at ${server_path} to ${old_sources_path}"
-  mv ${server_path} ${old_sources_path}
+  echo "$0: Moving sources at ${serverroot} to ${old_sources_path}"
+  mv ${serverroot} ${old_sources_path}
 fi
 
 # Checkout OpenACS core
-mkdir -p ${server_path}-tmp
-cd ${server_path}-tmp
+mkdir -p ${serverroot}-tmp
+cd ${serverroot}-tmp
 oacs_branch=`get_config_param oacs_branch`
 if [ -z "$oacs_branch" ]; then
     oacs_branch="HEAD"
 fi
 echo "$0: Checking out acs-core from branch $oacs_branch"
 cvs -q -d :pserver:anonymous:@openacs.org:/cvsroot login
 cvs -q -z3 -d :pserver:anonymous@openacs.org:/cvsroot checkout -r $oacs_branch acs-core
-mv ${server_path}-tmp/openacs-4 ${server_path}
-rmdir ${server_path}-tmp
+mv ${serverroot}-tmp/openacs-4 ${serverroot}
+rmdir ${serverroot}-tmp
 
 if [ $dotlrn == "yes" ]; then
     # Checkout needed packages
     echo "$0: Checking out packages from branch $oacs_branch"
-    cd ${server_path}/packages
+    cd ${serverroot}/packages
     cvs -q -z3 -d :pserver:anonymous@openacs.org:/cvsroot co -r $oacs_branch \
       acs-datetime acs-developer-support acs-events acs-mail-lite \
       attachments bulk-mail calendar faq file-storage forums general-comments \
@@ -82,9 +79,9 @@
     if parameter_true "$use_timesaver_files"; then
 	echo "$0: Copying timesaver files"
 	cp ${script_path}/ref-timezones-rules.sql \
-	    ${server_path}/packages/ref-timezones/sql/common
+	    ${serverroot}/packages/ref-timezones/sql/common
 	cp ${script_path}/ref-timezones-data.sql \
-	    ${server_path}/packages/ref-timezones/sql/common
+	    ${serverroot}/packages/ref-timezones/sql/common
     fi
 
     # Checkout .LRN
@@ -99,8 +96,8 @@
 
     # Copy graphics files
     echo "$0: Copying graphics files"
-    mkdir ${server_path}/www/graphics
-    cp ${server_path}/packages/dotlrn/www/graphics/* ${server_path}/www/graphics
+    mkdir ${serverroot}/www/graphics
+    cp ${serverroot}/packages/dotlrn/www/graphics/* ${serverroot}/www/graphics
 fi
 
 # The idea of this script is to copy in any files (AOLServer config files,
@@ -111,5 +108,5 @@
 fi
 
 # Set proper privileges
-chown -R nsadmin.web ${server_path}
-chmod -R 775 ${server_path}
+chown -R nsadmin.web ${serverroot}
+chmod -R g+rwX ${serverroot}
Index: openacs-4/etc/install/config.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/install/Attic/config.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/etc/install/config.tcl	5 Sep 2003 07:37:09 -0000	1.2
+++ openacs-4/etc/install/config.tcl	5 Sep 2003 07:40:05 -0000	1.3
@@ -1,7 +1,6 @@
 # TCLWebTest configuration
 set tclwebtest_dir "/usr/local/tclwebtest"
 
-
 set server "service0"
 
 # Choose database - oracle or postgres
Index: openacs-4/etc/install/install.sh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/install/install.sh,v
diff -u -r1.2 -r1.3
--- openacs-4/etc/install/install.sh	5 Sep 2003 07:37:09 -0000	1.2
+++ openacs-4/etc/install/install.sh	5 Sep 2003 07:40:05 -0000	1.3
@@ -4,9 +4,8 @@
 #
 # This script recreates an OpenACS server from scratch by:
 #
-
-# - dropping and adding the database
-# - Re-checking out the source code from CVS
+# - dropping and creating the database
+# - Re-checking out the source code from CVS (optional)
 # - Doing necessary installation and configuration of OpenACS and
 #   .LRN over HTTP that is normally done manually in a browser.
 #
@@ -149,7 +148,6 @@
 
 prompt_continue $interactive
 
-echo $do_checkout
 # Move away the old sources and checkout new ones check do_checkout
 if [ $dotlrn == "yes" ]; then
     echo "$0: Checking out .LRN at $(date)"