X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fvariables.sh;h=c9c3d37d7ebc76affcb2edd5bcd9f59e9d8ad62b;hb=d46483c93ecc9a4ef7d80656d23bd0891ddf5ac6;hp=7d13748ed9d1fcadab147cd81489cf317e693a52;hpb=78260fb9e066ca6e391494b567b2758073491edc;p=feisty_meow.git diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index 7d13748e..c9c3d37d 100644 --- a/scripts/core/variables.sh +++ b/scripts/core/variables.sh @@ -250,7 +250,7 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org # initializes the feisty meow build variables, if possible. function initialize_build_variables() { - found_build_vars=0 + local found_build_vars=nope # we need to know the feisty meow directory, or we bail. if [ -z "$FEISTY_MEOW_APEX" ]; then return; fi # pick from our expected generator folder, but make sure it's there... @@ -258,10 +258,10 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org if [ -f "$buildvars" ]; then # yep, that one looks good, so pull in the build defs. source "$buildvars" "$buildvars" - found_build_vars=1 + found_build_vars=true fi # now augment the environment if we found our build variables. - if [ $found_build_vars == 1 ]; then + if [ $found_build_vars == true ]; then # the binary directory contains our collection of handy programs. define_yeti_variable FEISTY_MEOW_BINARIES=$TARGETS_STORE # add binaries created within build to the path. @@ -294,7 +294,7 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org ############## # set the SHUNIT_PATH so our shunit tests can find the codebase. - define_yeti_variable SHUNIT_PATH="$FEISTY_MEOW_SCRIPTS/shunit" + define_yeti_variable SHUNIT_PATH="$FEISTY_MEOW_SCRIPTS/testkit/shunit" ##############