X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Freconfigure_feisty_meow.sh;h=3491beb88652145c437937bb23b8a306e04ae02a;hb=752de8370db122bab6ba15d4af0a6b7103068b15;hp=ffef72705456a7dee46ec57ad194c281f828d58c;hpb=2405c4e4b87387eb234fbbc4af9f5083c12b858c;p=feisty_meow.git diff --git a/scripts/core/reconfigure_feisty_meow.sh b/scripts/core/reconfigure_feisty_meow.sh index ffef7270..3491beb8 100644 --- a/scripts/core/reconfigure_feisty_meow.sh +++ b/scripts/core/reconfigure_feisty_meow.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # reconfigure_feisty_meow: # @@ -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" @@ -75,9 +77,10 @@ PERLLIB=$PERLLIB PERL5LIB=$PERLLIB perl "$FEISTY_MEOW_SCRIPTS/core/generate_alia #echo after the generate aliases, perllib is $PERLLIB if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then - echo established these variables for feisty_meow assets: + echo this is the variable config file for feisty_meow assets: echo ============== cat "$FEISTY_MEOW_VARIABLES_LOADING_FILE" echo ============== fi +