Changeset 18977

Timestamp:

Aug 8, 2008, 3:12:17 PM (18 years ago)

Author:

Paul Price

Message:

Merging Sebastian's tree: added '-f' to all csh calls to make startup faster and avoid timeouts of 'controller host add' in pantasks.

Location:

trunk/psconfig

Files:

• INSTALL (modified) (4 diffs)
• psconfig.bash.in (modified) (3 diffs)

trunk/psconfig/INSTALL

@@ -45 +45 @@
     if [ -f /home/kiawe/eugene/psconfig/psconfig.csh ]; then
       alias psconfig='source /home/kiawe/eugene/psconfig/psconfig.bash'
+      # In bash, can't use an alias in the same file that defines it, so need to
+      # expand it here explicitly to make 'controller host add' work in pantasks
+      source /home/kiawe/eugene/psconfig/psconfig.bash default
     else
       alias psconfig='echo psconfig not available'
     fi
-    psconfig default
+    
 
 Though, in your case, "/home/kiawe/eugene/psconfig/" will be replaced
@@ -88 +91 @@
 at:
 
-http://pan-starrs.ifa.hawaii.edu/project/IPP/software/extlibs-2.5.tgz
-http://pan-starrs.ifa.hawaii.edu/project/IPP/software/extperl-2.5.tgz
+http://pan-starrs.ifa.hawaii.edu/project/IPP/software/extlibs-2.6.1.tgz
+http://pan-starrs.ifa.hawaii.edu/project/IPP/software/extperl-2.6.1.tgz
 
 These should be installed so they will be available in the user's
@@ -103 +106 @@
 Perl modules, and can be used to install them in the appropriate user
 location in the psconfig system.  The command defaults to the latest
-perl installation table (eg, tagsets/ipp-2.5.perl).
+perl installation table (eg, tagsets/ipp-2.6.1.perl).
 
 pscheckperl
@@ -135 +138 @@
 external libraries and perl modules from:
 
-http://pan-starrs.ifa.hawaii.edu/project/IPP/software/extlibs-2.5.tgz
-http://pan-starrs.ifa.hawaii.edu/project/IPP/software/extperl-2.5.tgz
+http://pan-starrs.ifa.hawaii.edu/project/IPP/software/extlibs-2.6.1.tgz
+http://pan-starrs.ifa.hawaii.edu/project/IPP/software/extperl-2.6.1.tgz
 
 It should be possible to build the full IPP installation by issuing

trunk/psconfig/psconfig.bash.in

@@ -7 +7 @@
 
 if (( $# == 0 )); then
-  /bin/csh $PSCONFDIR/psconfig.csh
+  /bin/csh -f $PSCONFDIR/psconfig.csh
   return 0
 fi
@@ -17 +17 @@
 
 if [[ "$1" == "--list" ]]; then
-  /bin/csh $PSCONFDIR/psconfig.csh --list
+  /bin/csh -f $PSCONFDIR/psconfig.csh --list
   return 0
 fi
 
 version=$1
-psconfigure=`/bin/csh $PSCONFDIR/psconfig.csh --psconfigure $version`
-psautogen=`/bin/csh $PSCONFDIR/psconfig.csh --psautogen $version`
-psperlbuild=`/bin/csh $PSCONFDIR/psconfig.csh --psperlbuild $version`
+psconfigure=`/bin/csh -f $PSCONFDIR/psconfig.csh --psconfigure $version`
+psautogen=`/bin/csh -f $PSCONFDIR/psconfig.csh --psautogen $version`
+psperlbuild=`/bin/csh -f $PSCONFDIR/psconfig.csh --psperlbuild $version`
 alias psconfigure=$psconfigure
 alias psautogen=$psautogen
@@ -30 +30 @@
 
 # psconfig env variables
-export PSCONFDIR=`/bin/csh $PSCONFDIR/psconfig.csh --psconfdir $version`
-export PSVERSION=`/bin/csh $PSCONFDIR/psconfig.csh --psversion $version`
+export PSCONFDIR=`/bin/csh -f $PSCONFDIR/psconfig.csh --psconfdir $version`
+export PSVERSION=`/bin/csh -f $PSCONFDIR/psconfig.csh --psversion $version`
 
 # environment variables
-export PATH=`/bin/csh $PSCONFDIR/psconfig.csh --path $version`
-export ARCH=`/bin/csh $PSCONFDIR/psconfig.csh --arch $version`
-export LD_LIBRARY_PATH=`/bin/csh $PSCONFDIR/psconfig.csh --ld_library_path $version`
-export PKG_CONFIG_PATH=`/bin/csh $PSCONFDIR/psconfig.csh --pkg_config_path $version`
-export ACLOCAL_FLAGS=`/bin/csh $PSCONFDIR/psconfig.csh --aclocal_flags $version`
-export PERL5LIB=`/bin/csh $PSCONFDIR/psconfig.csh --perl5lib $version`
+export PATH=`/bin/csh -f $PSCONFDIR/psconfig.csh --path $version`
+export ARCH=`/bin/csh -f $PSCONFDIR/psconfig.csh --arch $version`
+export LD_LIBRARY_PATH=`/bin/csh -f $PSCONFDIR/psconfig.csh --ld_library_path $version`
+export PKG_CONFIG_PATH=`/bin/csh -f $PSCONFDIR/psconfig.csh --pkg_config_path $version`
+export ACLOCAL_FLAGS=`/bin/csh -f $PSCONFDIR/psconfig.csh --aclocal_flags $version`
+export PERL5LIB=`/bin/csh -f $PSCONFDIR/psconfig.csh --perl5lib $version`