o Update the bundle scripts so they don't muck around with the CWD.

diff --git a/bundle/make-bin-bundle b/bundle/make-bin-bundle
index 78d6517c10160f53805e8a58e9b528122c9fceab..c06512b6a3b749d778fc4abeb307e26280b914c3 100755 (executable)
--- a/bundle/make-bin-bundle
+++ b/bundle/make-bin-bundle
@@ -10,13 +10,40 @@
 #        ./make-bin-bundle
 #
 
+if [ "x$GLOBUS_LOCATION" = "x" ]; then
+    echo "Please set GLOBUS_LOCATION to the location from which you wish to make the binary bundle."
+    exit;
+fi
+
 source version.sh
 
 NAME="gsi_openssh_bundle-$VERSION-i686-pc-linux-gnu.tar.gz"
+XML="gsi_openssh_bundle-bin.xml"
+
+if [ ! -e output/$NAME ]; then
+    if [ ! -e output/ ]; then
+        mkdir -p output/
+    fi
+
+    if [ ! -e work/ ]; then
+        WORK_SCRIPTCREATED="1"
+        mkdir -p work/
+        cp $XML work/
+    fi
 
-if [ ! -e $NAME ]; then
-    $GPT_LOCATION/sbin/gpt-bundle -output=$NAME -bv=$VERSION -xml=gsi_openssh_bundle-bin.xml
+    if [ ! -e work/sources/ ]; then
+        cp -a sources work/sources
+    fi
+
+    cd work/
+    $GPT_LOCATION/sbin/gpt-bundle -output=$NAME -bv=$VERSION -xml=$XML
+    mv $NAME ../output/
+    cd ../
+
+    if [ "x$WORK_SCRIPTCREATED" != "x" ]; then
+        rm -rf work/
+    fi
 else; then
-    echo "Please remove $NAME before running this script."
+    echo "Please remove output/$NAME before running this script."
+    exit;
 fi
-

diff --git a/bundle/make-src-bundle b/bundle/make-src-bundle
index fd8c96e0947a06310164a80167a5a1ea9eddd89b..ef56ebd0b268cbb3ecff64faab2e37688811c79f 100755 (executable)
--- a/bundle/make-src-bundle
+++ b/bundle/make-src-bundle
@@ -10,9 +10,32 @@
 source version.sh
 
 NAME="gsi_openssh_bundle-$VERSION-src.tar.gz"
+XML="gsi_openssh_bundle-src.xml"
 
-if [ ! -e $NAME ]; then
-    $GPT_LOCATION/sbin/gpt-bundle -srcdir=sources/ -output=$NAME -bv=$VERSION -xml=gsi_openssh_bundle-src.xml
-else; then
-    echo "Please remove $NAME before running this script."
+if [ ! -e output/$NAME ]; then
+    if [ ! -e output/ ]; then
+        mkdir -p output/
+    fi
+
+    if [ ! -e work/ ]; then
+        WORK_SCRIPTCREATED="1"
+        mkdir -p work/
+        cp $XML work/
+    fi
+
+    if [ ! -e work/sources/ ]; then
+        cp -a sources work/sources
+    fi
+
+    cd work/
+    $GPT_LOCATION/sbin/gpt-bundle -srcdir=sources/ -output=$NAME -bv=$VERSION -xml=$XML
+    mv $NAME ../output/
+    cd ../
+
+    if [ "x$WORK_SCRIPTCREATED" != "x" ]; then
+        rm -rf work/
+    fi
+else
+    echo "Please remove output/$NAME before running this script."
+    exit;
 fi