Administrivia

Author: rocky

admin-tools/checkout_common.sh

@@ -2,6 +2,7 @@
 export PATH=$HOME/.pyenv/bin/pyenv:$PATH
 bs=${BASH_SOURCE[0]}
 mydir=$(dirname $bs)
+trepan3k_fulldir=$(readlink -f $mydir)
 
 function setup_version {
     local repo=$1

admin-tools/make-dist-3.6-3.10.sh

@@ -3,10 +3,12 @@ PACKAGE=trepan3k
 
 # FIXME put some of the below in a common routine
 function finish {
-  cd $make_dist_36_owd
+  if [[ -n "$make_trepan_dist_36_owd" ]] && [[ -n "$make_trepan_dist_36_owd" ]]; then
+     cd $make_trepan_dist_36_owd
+  fi
 }
 
-make_trepan_dist_36_owd=$(pwd)
+$make_trepan_dist_36_owd=$(pwd)
 trap finish EXIT
 
 cd $(dirname ${BASH_SOURCE[0]})

admin-tools/make-dist-newest.sh

@@ -3,7 +3,7 @@ PACKAGE=trepan3k
 
 # FIXME put some of the below in a common routine
 function finish {
-  if [[ -n "$make_dist_xdis_newest_owd" ]] then
+  if [[ -n "$make_trepan_dist_newest_owd" ]] && [[ -n "$make_trepan_newest_owd" ]]; then
      cd $make_dist_trepan3k_newest_owd
   fi
 }

admin-tools/setup-master.sh

@@ -2,17 +2,17 @@
 # Check out master branch and dependent development master branches
 PYTHON_VERSION=3.12
 
+trepan3k_owd=$(pwd)
 bs=${BASH_SOURCE[0]}
 if [[ $0 == $bs ]] ; then
     echo "This script should be *sourced* rather than run directly through bash"
     exit 1
 fi
 
 mydir=$(dirname $bs)
-trepan3k_owd=$(pwd)
-cd $mydir
-. ./checkout_common.sh
-(cd $mydir/../../../rocky && \
+trepan3k_fulldir=$(readlink -f $mydir)
+. ${trepan3k_fulldir}/checkout_common.sh
+(cd ${trepan3k_fulldir}/../../../rocky && \
      setup_version python-uncompyle6 master && \
      setup_version python-filecache master && \
      setup_version pytracer master && \