From: Fred T. Hamster Date: Wed, 3 Jun 2020 12:32:48 +0000 (+0000) Subject: minor mods X-Git-Tag: 2.140.134~20^2~1 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=2673f27cc649e9b2100103c553bf5b61f278f681;p=feisty_meow.git minor mods --- diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index 7d13748e..9e3d1312 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. diff --git a/scripts/generator/build_variables.sh b/scripts/generator/build_variables.sh index 8c324acc..3031d317 100644 --- a/scripts/generator/build_variables.sh +++ b/scripts/generator/build_variables.sh @@ -1,3 +1,5 @@ +#!/bin/bash + ############## # # Name : build variable calculator