Administrivia

Don't use finish in sourced admin programs

admin-tools/setup-master.sh

@@ -18,12 +18,7 @@ function checkout_version {
     return $?
 }
 
-# FIXME put some of the below in a common routine
-function finish {
-  cd $owd
-}
 owd=$(pwd)
-trap finish EXIT
 
 export PATH=$HOME/.pyenv/bin/pyenv:$PATH
 
@@ -35,4 +30,4 @@ cd $fulldir/..
 
 git pull
 rm -v */.python-version || true
-finish
+cd $owd