X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fgenerator%2Fbootstrap_build.sh;h=4f439bd081332004db3cc7248d2be8edefcffb9b;hb=8238e15a30eeefc366984ca0946f5d31366e13e9;hp=7a6f62c82d16e0052ee0a7fbca1d2ccfd826e798;hpb=bdb824878377ecabe634f15b6d420d4d17f271f2;p=feisty_meow.git diff --git a/scripts/generator/bootstrap_build.sh b/scripts/generator/bootstrap_build.sh index 7a6f62c8..4f439bd0 100644 --- a/scripts/generator/bootstrap_build.sh +++ b/scripts/generator/bootstrap_build.sh @@ -19,20 +19,28 @@ # # (1) the script should be run with a full path, so that it can decide where # it lives with minimal fuss. -# (2) on windows, the msys bin directory should already be in the path so that -# tools like dirname are already available. +# (2) on windows, the unix tools bin directory should already be in the path +# so that tools like dirname are already available. use msys or cygwin +# at your discretion and your own risk. # make sure we know how to find our bash bins. export PATH=/bin:$PATH + # signals that we're doing a fresh build to the variables script. export INCLUDED_FROM_BOOTSTRAP=true + # pull in our build variables using the path to this script. export BUILD_SCRIPTS_DIR="$( \cd "$(\dirname "$0")" && \pwd )" echo build script initial from bootstrap: $BUILD_SCRIPTS_DIR BUILD_SCRIPTS_DIR="$(echo $BUILD_SCRIPTS_DIR | tr '\\\\' '/' )" echo build script after: $BUILD_SCRIPTS_DIR + # load in feisty meow basic scripts, if not already loaded. -source "$BUILD_SCRIPTS_DIR/../core/launch_feisty_meow.sh" +if [ -z "$FEISTY_MEOW_SCRIPTS_LOADED" ]; then + bash "$BUILD_SCRIPTS_DIR/../core/bootstrap_shells.sh" + source "$BUILD_SCRIPTS_DIR/../core/launch_feisty_meow.sh" +fi + # load in build variables based on our deduced paths. source "$BUILD_SCRIPTS_DIR/build_variables.sh" "$BUILD_SCRIPTS_DIR/build_variables.sh"