Skip to content

Commit e73cd74

Browse files
committed
More administrivia -
go over git branch checkout programs
1 parent 02ed25e commit e73cd74

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

admin-tools/check-2.4-2.7-versions.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
set -e
23
function finish {
34
cd $owd
45
}
@@ -25,3 +26,4 @@ for version in $PYVERSIONS; do
2526
fi
2627
echo === $version ===
2728
done
29+
finish

admin-tools/setup-python-2.4.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ function checkout_version {
1010
return $?
1111
}
1212

13+
function finish {
14+
cd $owd
15+
}
16+
1317
owd=$(pwd)
1418
bs=${BASH_SOURCE[0]}
1519
if [[ $0 == $bs ]] ; then
@@ -20,5 +24,5 @@ mydir=$(dirname $bs)
2024
fulldir=$(readlink -f $mydir)
2125
(cd $fulldir/.. && checkout_version python-spark && checkout_version python-xdis python-2.4-to-2.7 &&
2226
checkout_version python-uncompyle6)
23-
cd $owd
2427
rm -v */.python-version || true
28+
finish

admin-tools/setup-python-3.0.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
set -e
23
PYTHON_VERSION=3.0.1
34
pyenv local $PYTHON_VERSION
45

@@ -29,7 +30,7 @@ fulldir=$(readlink -f $mydir)
2930
cd $fulldir/..
3031
(cd $fulldir/.. && checkout_version python-spark master && checkout_version python-xdis &&
3132
checkout_version python-uncompyle6)
32-
cd $owd
33-
rm -v */.python-version || true
3433

3534
git checkout python-3.0-to-3.2 && git pull && pyenv local $PYTHON_VERSION
35+
rm -v */.python-version || true
36+
finish

admin-tools/setup-python-3.3.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
set -e
23
PYTHON_VERSION=3.3.7
34
pyenv local $PYTHON_VERSION
45

@@ -28,8 +29,9 @@ mydir=$(dirname $bs)
2829
fulldir=$(readlink -f $mydir)
2930
cd $fulldir/..
3031
(cd $fulldir/.. && checkout_version python-spark master && checkout_version python-xdis &&
31-
checkout_version python-uncompyle6)
32-
cd $owd
32+
checkout_version python-uncompyle6)
3333
rm -v */.python-version || true
3434

3535
git checkout python-3.3-to-3.5 && git pull && pyenv local $PYTHON_VERSION
36+
rm -v */.python-version || true
37+
finish

0 commit comments

Comments
 (0)