From: Chris Koeritz Date: Mon, 16 Jan 2012 05:59:28 +0000 (-0500) Subject: making more armored against missing configs. X-Git-Tag: 2.140.90~1664 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=4cba11c31bb83ff62fc3bdc9b246cb55d9612c02;hp=9fd22b6e5c4bb1aa1b3975da8d4d436664a0a03d;p=feisty_meow.git making more armored against missing configs. --- diff --git a/scripts/generator/bootstrap_build.sh b/scripts/generator/bootstrap_build.sh index b107cff6..5a07d9bc 100644 --- a/scripts/generator/bootstrap_build.sh +++ b/scripts/generator/bootstrap_build.sh @@ -31,6 +31,8 @@ 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/profile.sh" # drop any previous version of the repository variable. unset REPOSITORY_DIR source "$BUILD_SCRIPTS_DIR/build_variables.sh" "$BUILD_SCRIPTS_DIR/build_variables.sh" diff --git a/scripts/generator/whack_build.sh b/scripts/generator/whack_build.sh index bedd3a09..6b052250 100644 --- a/scripts/generator/whack_build.sh +++ b/scripts/generator/whack_build.sh @@ -48,7 +48,7 @@ function whack_single_build_area() if [ "$clean_src" == "clean" -o "$clean_src" == "CLEAN" ]; then echo $(date): " ** Aggressive cleaning activated..." - perl "$SHELLDIR/files/zapdirs.pl" "$CLEANING_TOP" >>"$CRUDFILE" + perl "$REPOSITORY_DIR/scripts/files/zapdirs.pl" "$CLEANING_TOP" >>"$CRUDFILE" fi echo $(date): "Cleaned [$choprepo]."