Index: openacs-4/etc/install/checkout.sh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/install/checkout.sh,v diff -u -r1.13 -r1.14 --- openacs-4/etc/install/checkout.sh 18 Nov 2003 10:36:40 -0000 1.13 +++ openacs-4/etc/install/checkout.sh 20 Nov 2003 13:58:58 -0000 1.14 @@ -17,20 +17,24 @@ #set -x export CVS_RSH=ssh -script_path=$(dirname $(which $0)) +export script_path=$(dirname $(which $0)) cd $script_path # Sometimes script path will be the dot so I need this workaround -script_path=$PWD +export script_path=$(pwd) source ./functions.sh # Fetch config parameters +# NOTE: fetching parameters further down in the script will not work +# if the config_file=./install.tcl since we are cd:ing to a different dir +# below serverroot=`get_config_param serverroot` aolserver_user=`get_config_param aolserver_user` aolserver_group=`get_config_param aolserver_group` packages_list=`get_config_param packages_list` +oacs_branch=`get_config_param oacs_branch` echo "$0: Starting checkout for server path $serverroot with config_file $config_file and dotlrn=$dotlrn" @@ -52,13 +56,13 @@ # Checkout OpenACS core mkdir -p ${serverroot}-tmp cd ${serverroot}-tmp -oacs_branch=`get_config_param oacs_branch` if [ "$oacs_branch" == "HEAD" ]; then oacs_branch_switch="" else oacs_branch_switch="-r $oacs_branch" fi -echo "$0: Checking out acs-core from branch $oacs_branch" + +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 mv ${serverroot}-tmp/openacs-4 ${serverroot} Index: openacs-4/etc/install/install.sh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/etc/install/install.sh,v diff -u -r1.35 -r1.36 --- openacs-4/etc/install/install.sh 20 Nov 2003 12:53:59 -0000 1.35 +++ openacs-4/etc/install/install.sh 20 Nov 2003 13:58:58 -0000 1.36 @@ -39,7 +39,7 @@ #--------------------------------------------------------------------- # Set the script directory to the current dir for convenience -script_path=$(dirname $(which $0)) +export script_path=$(dirname $(which $0)) cd $script_path