projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed some debugging and added missing class name definition.
[feisty_meow.git]
/
scripts
/
buildor
/
build_xsedes.sh
diff --git
a/scripts/buildor/build_xsedes.sh
b/scripts/buildor/build_xsedes.sh
index 1996208e7549d2b257a861ac835955171f523766..7b53fea5765a51a357bc130e1d9ef1e15a91d451 100644
(file)
--- a/
scripts/buildor/build_xsedes.sh
+++ b/
scripts/buildor/build_xsedes.sh
@@
-11,7
+11,7
@@
function build_xsede()
echo GENII_INSTALL_DIR is not set.
return 1
fi
echo GENII_INSTALL_DIR is not set.
return 1
fi
- pushd
$GENII_INSTALL_DIR
+ pushd
"$GENII_INSTALL_DIR"
if [ $? -ne 0 ]; then
error_sound
return 1
if [ $? -ne 0 ]; then
error_sound
return 1
@@
-39,7
+39,7
@@
function rebuild_xsede()
echo GENII_INSTALL_DIR is not set.
return 1
fi
echo GENII_INSTALL_DIR is not set.
return 1
fi
- pushd
$GENII_INSTALL_DIR
+ pushd
"$GENII_INSTALL_DIR"
ant clean
if [ $? -ne 0 ]; then
ant clean
if [ $? -ne 0 ]; then
@@
-56,7
+56,12
@@
function rebu_bootstrap()
rebuild_xsede
if [ $? -ne 0 ]; then echo "failed to rebuild xsede code"; return 1; fi
rebuild_xsede
if [ $? -ne 0 ]; then echo "failed to rebuild xsede code"; return 1; fi
- bash $GENII_INSTALL_DIR/xsede_tools/library/bootstrap_quick_start.sh
+ quickstarter="$GENII_INSTALL_DIR/xsede_tools/library/bootstrap_quick_start.sh"
+ if [ ! -f "$quickstarter" ]; then
+ quickstarter="$XSEDE_TEST_ROOT/library/bootstrap_quick_start.sh"
+ fi
+
+ bash "$quickstarter"
if [ $? -ne 0 ]; then
echo "failed to bootstrap a container."
error_sound
if [ $? -ne 0 ]; then
echo "failed to bootstrap a container."
error_sound
@@
-72,7
+77,12
@@
function bu_bootstrap()
build_xsede
if [ $? -ne 0 ]; then echo "failed to rebuild xsede code"; return 1; fi
build_xsede
if [ $? -ne 0 ]; then echo "failed to rebuild xsede code"; return 1; fi
- bash $GENII_INSTALL_DIR/xsede_tools/library/bootstrap_quick_start.sh
+ quickstarter="$GENII_INSTALL_DIR/xsede_tools/library/bootstrap_quick_start.sh"
+ if [ ! -f "$quickstarter" ]; then
+ quickstarter="$XSEDE_TEST_ROOT/library/bootstrap_quick_start.sh"
+ fi
+
+ bash "$quickstarter"
if [ $? -ne 0 ]; then
echo "failed to bootstrap a container."
error_sound
if [ $? -ne 0 ]; then
echo "failed to bootstrap a container."
error_sound
@@
-85,12
+95,9
@@
function bu_bootstrap()
# a shortcut for doing a quick build and then creating an installer.
function fast_install_build()
{
# a shortcut for doing a quick build and then creating an installer.
function fast_install_build()
{
- build_xsede
- if [ $? -ne 0 ]; then echo "failed to build xsede code"; return 1; fi
-
- bash $GENII_INSTALL_DIR/xsede_tools/tools/installer/fast_installer_build.sh $*
+ bash "$GENII_INSTALL_DIR/xsede_tools/tools/installer/fast_installer_build.sh" $*
if [ $? -ne 0 ]; then
if [ $? -ne 0 ]; then
- echo "failed to
bootstrap
create the installer."
+ echo "failed to create the installer."
error_sound
return 1
fi
error_sound
return 1
fi