X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Freconfigure_feisty_meow.sh;h=b7e5dda07085f5c5fe0abb67c1bdff29d36dd8a2;hb=3ccfc799c6e1bcc3c0b282797267a65aa7e4c714;hp=b6421224607bcd18d5fd39ca55e630eff0046113;hpb=5dacef4621a07b9289d3ec6882862b7d2390387f;p=feisty_meow.git diff --git a/scripts/core/reconfigure_feisty_meow.sh b/scripts/core/reconfigure_feisty_meow.sh index b6421224..b7e5dda0 100644 --- a/scripts/core/reconfigure_feisty_meow.sh +++ b/scripts/core/reconfigure_feisty_meow.sh @@ -25,15 +25,15 @@ export FEISTY_MEOW_APEX="$(/bin/pwd)" unset CORE_VARIABLES_LOADED # repetitive bit stolen from variables. should make a file out of this somehow. -IS_DOS=$(uname | grep -i ming) -if [ -z "$IS_DOS" ]; then IS_DOS=$(uname | grep -i cygwin); fi -# now if we're stuck in DOS, then fix the feisty meow variable name. -if [ ! -z "$IS_DOS" ]; then - FEISTY_MEOW_APEX="$(cmd /c chdir | tr A-Z a-z | sed -e 's/\\/\//g')" -echo feisty meow dos is: $FEISTY_MEOW_APEX - FEISTY_MEOW_APEX="$(dos_to_unix_path "$FEISTY_MEOW_APEX")" -echo new feisty meow fixed dir is: $FEISTY_MEOW_APEX -fi +#IS_DOS=$(uname | grep -i ming) +#if [ -z "$IS_DOS" ]; then IS_DOS=$(uname | grep -i cygwin); fi +## now if we're stuck in DOS, then fix the feisty meow variable name. +#if [ ! -z "$IS_DOS" ]; then +# FEISTY_MEOW_APEX="$(cmd /c chdir | tr A-Z a-z | sed -e 's/\\/\//g')" +#echo feisty meow dos is: $FEISTY_MEOW_APEX +# FEISTY_MEOW_APEX="$(dos_to_unix_path "$FEISTY_MEOW_APEX")" +#echo new feisty meow fixed dir is: $FEISTY_MEOW_APEX +#fi popd &>/dev/null @@ -51,12 +51,14 @@ export PERLLIB=$(echo $PERLLIB | sed -e "s?\([:]*\)\([^:]*feisty_meow[^:]*\)\([: PERLLIB=$PERLLIB:"$FEISTY_MEOW_SCRIPTS/core":"$FEISTY_MEOW_SCRIPTS/files":"$FEISTY_MEOW_SCRIPTS/generator" PERL5LIB=$PERLLIB #echo PERLLIB after modification is $PERLLIB + # make toast out of generated files right away, but leave any custom scripts. -find "$FEISTY_MEOW_LOADING_DOCK" -maxdepth 1 -type f -exec perl "$FEISTY_MEOW_SCRIPTS/files/safedel.pl" "{}" ';' -# &>/dev/null -if [ ! -d "$FEISTY_MEOW_LOADING_DOCK/custom" ]; then - mkdir "$FEISTY_MEOW_LOADING_DOCK/custom" -fi +\rm -f "$FEISTY_MEOW_LOADING_DOCK"/fmc_* + +## #no, old: +## if [ ! -d "$FEISTY_MEOW_LOADING_DOCK/custom" ]; then +## mkdir "$FEISTY_MEOW_LOADING_DOCK/custom" +## fi # just a variable we use in here to refer to the generated variables file. FEISTY_MEOW_VARIABLES_LOADING_FILE="$FEISTY_MEOW_LOADING_DOCK/fmc_variables.sh" @@ -81,3 +83,4 @@ if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then echo ============== fi +