From 9f9f6de983ec27cd6c2afd4c7e457b4c9af08446 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sat, 17 Feb 2024 15:11:09 -0500
Subject: [PATCH] Administrivia

Don't use finish in sourced admin programs
---
 admin-tools/pyenv-newest-versions | 2 +-
 admin-tools/setup-master.sh       | 7 +------
 admin-tools/setup-python-2.4.sh   | 6 +-----
 admin-tools/setup-python-3.0.sh   | 5 +----
 admin-tools/setup-python-3.3.sh   | 6 +-----
 5 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/admin-tools/pyenv-newest-versions b/admin-tools/pyenv-newest-versions
index f8a24d31..b8dd8d58 100644
--- a/admin-tools/pyenv-newest-versions
+++ b/admin-tools/pyenv-newest-versions
@@ -5,4 +5,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
     echo "This script should be *sourced* rather than run directly through bash"
     exit 1
 fi
-export PYVERSIONS='3.6.15 pypy3.6-7.3.1 3.7.16 pypy3.7-7.3.9 pypy3.8-7.3.10 pyston-2.3.5 3.8.17'
+export PYVERSIONS='3.6.15 pypy3.6-7.3.1 3.7.16 pypy3.7-7.3.9 pypy3.8-7.3.10 pyston-2.3.5 3.8.18'
diff --git a/admin-tools/setup-master.sh b/admin-tools/setup-master.sh
index a2f87ece..2a474fc2 100755
--- a/admin-tools/setup-master.sh
+++ b/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
diff --git a/admin-tools/setup-python-2.4.sh b/admin-tools/setup-python-2.4.sh
index 5b9430b9..ed6d2bde 100755
--- a/admin-tools/setup-python-2.4.sh
+++ b/admin-tools/setup-python-2.4.sh
@@ -19,11 +19,7 @@ function checkout_version {
     return $?
 }
 
-function finish {
-  cd $owd
-}
 owd=$(pwd)
-trap finish EXIT
 
 export PATH=$HOME/.pyenv/bin/pyenv:$PATH
 
@@ -34,4 +30,4 @@ fulldir=$(readlink -f $mydir)
 
 git pull
 rm -v */.python-version || true
-finish
+cd $owd
diff --git a/admin-tools/setup-python-3.0.sh b/admin-tools/setup-python-3.0.sh
index 5e61da11..8ff1c538 100644
--- a/admin-tools/setup-python-3.0.sh
+++ b/admin-tools/setup-python-3.0.sh
@@ -20,9 +20,6 @@ function checkout_version {
     return $?
 }
 
-function finish {
-  cd $owd
-}
 owd=$(pwd)
 trap finish EXIT
 
@@ -36,4 +33,4 @@ cd $fulldir/..
 
 git pull
 rm -v */.python-version || true
-finish
+cd $owd
diff --git a/admin-tools/setup-python-3.3.sh b/admin-tools/setup-python-3.3.sh
index e51fc7f3..5f6f8ea7 100755
--- a/admin-tools/setup-python-3.3.sh
+++ b/admin-tools/setup-python-3.3.sh
@@ -19,11 +19,7 @@ function checkout_version {
     return $?
 }
 
-function finish {
-  cd $owd
-}
 owd=$(pwd)
-trap finish EXIT
 
 export PATH=$HOME/.pyenv/bin/pyenv:$PATH
 
@@ -36,4 +32,4 @@ rm -v */.python-version || true
 
 git pull
 rm -v */.python-version || true
-finish
+cd $owd