Index: openacs-4/etc/install/checkout.sh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/install/checkout.sh,v diff -u -r1.14 -r1.15 --- openacs-4/etc/install/checkout.sh 20 Nov 2003 13:58:58 -0000 1.14 +++ openacs-4/etc/install/checkout.sh 12 Apr 2005 18:52:08 -0000 1.15 @@ -63,8 +63,8 @@ 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 $oacs_branch_switch acs-core +cvs -q -d :pserver:anonymous:@cvs.openacs.org:/cvsroot login +cvs -q -z3 -d :pserver:anonymous@cvs.openacs.org:/cvsroot checkout $oacs_branch_switch acs-core mv ${serverroot}-tmp/openacs-4 ${serverroot} rmdir ${serverroot}-tmp @@ -74,26 +74,15 @@ # Checkout additional packages (modules) for package in $packages_list do - cvs -q -z3 -d :pserver:anonymous@openacs.org:/cvsroot checkout $oacs_branch_switch $package + cvs -q -z3 -d :pserver:anonymous@cvs.openacs.org:/cvsroot checkout $oacs_branch_switch $package done fi if [ $dotlrn == "yes" ]; then # Checkout needed packages echo "$0: Checking out packages from branch $oacs_branch" - cvs -q -z3 -d :pserver:anonymous@openacs.org:/cvsroot co $oacs_branch_switch dotlrn-prereq + cvs -q -z3 -d :pserver:anonymous@cvs.openacs.org:/cvsroot co $oacs_branch_switch dotlrn-all - # Checkout .LRN - dotlrn_branch=`get_config_param dotlrn_branch` - if [ "$dotlrn_branch" == "HEAD"]; then - dotlrn_branch_switch="" - else - dotlrn_branch_switch="-r $dotlrn_branch" - fi - echo "$0: Checking out .LRN from branch $dotlrn_branch" - cvs -q -d :pserver:anonymous:@dotlrn.openacs.org:/dotlrn-cvsroot login - cvs -q -z3 -d :pserver:anonymous@dotlrn.openacs.org:/dotlrn-cvsroot \ - co $dotlrn_branch_switch dotlrn-core fi echo $(date) > ${serverroot}/www/SYSTEM/checkout-date Index: openacs-4/etc/install/install.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/install/install.tcl,v diff -u -r1.26 -r1.27 --- openacs-4/etc/install/install.tcl 24 Feb 2004 14:22:01 -0000 1.26 +++ openacs-4/etc/install/install.tcl 12 Apr 2005 18:52:08 -0000 1.27 @@ -287,9 +287,6 @@ # should we install dotlrn? set dotlrn "no" -# Which tag should we checkout from? -set dotlrn_branch "HEAD" - # Should basic demo setup of departments, classes, users, etc. be done? set dotlrn_demo_data "no" set dotlrn_users_data_file "users-data.csv" Index: openacs-4/etc/install/updateserver.sh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/install/updateserver.sh,v diff -u -r1.1 -r1.2 --- openacs-4/etc/install/updateserver.sh 23 Feb 2004 15:49:14 -0000 1.1 +++ openacs-4/etc/install/updateserver.sh 12 Apr 2005 18:52:08 -0000 1.2 @@ -14,8 +14,7 @@ cvs_args_with_dir="-f -q update -Pd" cvs_args_no_dir="-f -q update -P" -oacs_cvs="cvs -d :pserver:anonymous@openacs.org:/cvsroot" -lrn_cvs="cvs -d :pserver:anonymous@dotlrn.openacs.org:/dotlrn-cvsroot" +oacs_cvs="cvs -d :pserver:anonymous@cvs.openacs.org:/cvsroot" # CVS update in root without new dirs echo "$0 - Updating in root dir $server_root" @@ -30,14 +29,7 @@ cd $dir echo "$0 - Updating package $dir" - dotlrn_p=$(grep dotlrn CVS/Root) - if [ -z "$dotlrn_p" ]; then - cvscommand=$oacs_cvs - else - cvscommand=$lrn_cvs - fi - - $cvscommand $cvs_args_with_dir + $oacs_cvs $cvs_args_with_dir cd .. done Index: openacs-4/etc/install/oracle/recreate-user.sh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/install/oracle/recreate-user.sh,v diff -u -r1.3 -r1.4 --- openacs-4/etc/install/oracle/recreate-user.sh 9 Dec 2003 09:17:13 -0000 1.3 +++ openacs-4/etc/install/oracle/recreate-user.sh 12 Apr 2005 18:52:08 -0000 1.4 @@ -1,5 +1,5 @@ #!/bin/bash -# Assumes the envirionment variable config_file to be set +# Assumes the environment variable config_file to be set # The drop and create scripts are assumed to be in the same directory as this script script_path=$(dirname $(which $0))