From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 29 Jan 2016 13:03:08 +0000 (-0500)
Subject: mods for gffs building
X-Git-Tag: 2.140.90~548
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=ae3bc819e6978eaf7bb9d860b3457f0a5908d833;p=feisty_meow.git

mods for gffs building
---

diff --git a/scripts/buildor/gffs_builders.sh b/scripts/buildor/gffs_builders.sh
index 22ad74de..3503ed63 100644
--- a/scripts/buildor/gffs_builders.sh
+++ b/scripts/buildor/gffs_builders.sh
@@ -20,13 +20,10 @@ export GFFS_CHECK_VARS='
 function build_gffs()
 {
   eval $GFFS_CHECK_VARS
-#  if [ -z "$GENII_INSTALL_DIR" -o -z "$GFFS_TOOLKIT_ROOT" ]; then
-#    echo GENII_INSTALL_DIR is not set.
-#    return 1
-#  fi
   #zapem
   pushd "$GENII_INSTALL_DIR"
   if [ $? -ne 0 ]; then
+    popd
     error_sound
     return 1
   fi
@@ -38,6 +35,7 @@ function build_gffs()
   # build the trunk.
   ant -Dbuild.targetArch=64 build
   if [ $? -ne 0 ]; then
+    popd
     error_sound
     return 1
   fi
@@ -50,19 +48,14 @@ function build_gffs()
 function rebuild_gffs()
 {
   eval $GFFS_CHECK_VARS
-#  if [ -z "$GENII_INSTALL_DIR" -o -z "$GFFS_TOOLKIT_ROOT" ]; then
-#    echo GENII_INSTALL_DIR is not set.
-#    return 1
-#  fi
   #zapem
   pushd "$GENII_INSTALL_DIR"
   ant clean
-
+  popd
   if [ $? -ne 0 ]; then
     error_sound
     return 1
   fi
-  popd
   build_gffs
 }