X-Git-Url: https://feistymeow.org/gitweb/?p=feisty_meow.git;a=blobdiff_plain;f=scripts%2Fcore%2Freconfigure_feisty_meow.sh;fp=scripts%2Fcore%2Freconfigure_feisty_meow.sh;h=ffef72705456a7dee46ec57ad194c281f828d58c;hp=dad26d1477cbdd79d404d90ca38673bd1de55e68;hb=a089b6ec67065c080a3e582cb69468cf2be8b8b6;hpb=29fb56bd4baaa451e2dc75c6fc0469363d95f259 diff --git a/scripts/core/reconfigure_feisty_meow.sh b/scripts/core/reconfigure_feisty_meow.sh index dad26d14..ffef7270 100644 --- a/scripts/core/reconfigure_feisty_meow.sh +++ b/scripts/core/reconfigure_feisty_meow.sh @@ -7,7 +7,7 @@ # # Note: this does not yet ensure that the profile is executed on shell # startup. that can be added manually by editing your .bashrc file. -# read the examples/feisty_meow_startup/bashrc_user file for more details. +# read the files infobase/feisty_inits for more details. ORIGINATING_FOLDER="$( \cd "$(\dirname "$0")" && /bin/pwd )" CORE_SCRIPTS_DIR="$(echo "$ORIGINATING_FOLDER" | tr '\\\\' '/' )" @@ -21,6 +21,9 @@ source "$CORE_SCRIPTS_DIR/functions.sh" export FEISTY_MEOW_APEX="$(/bin/pwd)" #echo feisty now is FEISTY_MEOW_APEX=$FEISTY_MEOW_APEX +# make the variables script run again. +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 @@ -42,7 +45,12 @@ if [ ! -d "$FEISTY_MEOW_LOADING_DOCK" ]; then mkdir -p "$FEISTY_MEOW_LOADING_DOCK" fi # need to add some paths explicitly until we've bootstrapped ourselves. -export PERLLIB=$PERLLIB:"$FEISTY_MEOW_SCRIPTS/files":"$FEISTY_MEOW_SCRIPTS/generator" +#hmmm: this is tasty reusable code... +export PERLLIB=$(echo $PERLLIB | sed -e "s?\([:]*\)\([^:]*feisty_meow[^:]*\)\([:]*\)??g") + +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 @@ -61,8 +69,10 @@ done # load our variables so we can run our perl scripts successfully. source "$FEISTY_MEOW_SCRIPTS/core/variables.sh" -# create our common aliases. -perl "$FEISTY_MEOW_SCRIPTS/core/generate_aliases.pl" +# create our common aliases. we need to refresh the PERLLIB since the shell +# seems to keep accumulating the value in a weird way. +PERLLIB=$PERLLIB PERL5LIB=$PERLLIB perl "$FEISTY_MEOW_SCRIPTS/core/generate_aliases.pl" +#echo after the generate aliases, perllib is $PERLLIB if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then echo established these variables for feisty_meow assets: