X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fvariables.sh;h=976c7898cbfd20ee14ffda97e0ee4443e9da05e9;hb=bea706608dd5b45782f21ab8642f48e4b7be28b1;hp=1ec14e315a10576d16c55fa61ec9c6f0e0f21a6b;hpb=b4b77f8dda5d32d43c0a1dd66f9a165b64cacb09;p=feisty_meow.git diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index 1ec14e31..976c7898 100644 --- a/scripts/core/variables.sh +++ b/scripts/core/variables.sh @@ -17,17 +17,16 @@ # this function always exports the variables it defines. function define_yeti_variable() { -# if variable exists already, save old value for restore, + #hmmm: simple implem just sets it up and exports the variable. + # i.e., this method always exports. + export "${@}" + +#hmmm: eventual approach-- if variable exists already, save old value for restore, # otherwise save null value for restore, # have to handle unsetting if there was no prior value of one # we newly defined. # add variable name to a list of feisty defined variables. -#hmmm: first implem just sets it up and exports the variable. -# i.e., this method always exports. -export "${@}" - - return 0 } @@ -51,7 +50,7 @@ define_yeti_variable TERM # we'll run this again only if we think it's needed. if [ -z "$CORE_VARIABLES_LOADED" ]; then - if [ ! -z "$SHELL_DEBUG" ]; then echo variables initialization begins...; fi + if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then echo variables initialization begins...; fi ############## @@ -106,18 +105,18 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then fi # set up the top-level for all build creations and logs and such. - if [ -z "$GENERATED_DIR" ]; then - define_yeti_variable GENERATED_DIR="$TMP/generated-feisty_meow" + if [ -z "$FEISTY_MEOW_GENERATED_STORE" ]; then + define_yeti_variable FEISTY_MEOW_GENERATED_STORE="$TMP/generated-feisty_meow" fi - if [ ! -d "$GENERATED_DIR" ]; then - mkdir -p "$GENERATED_DIR" + if [ ! -d "$FEISTY_MEOW_GENERATED_STORE" ]; then + mkdir -p "$FEISTY_MEOW_GENERATED_STORE" fi # set up our effluent outsourcing valves. - if [ -z "$TEMPORARIES_DIR" ]; then - define_yeti_variable TEMPORARIES_DIR="$GENERATED_DIR/temporaries" + if [ -z "$TEMPORARIES_PILE" ]; then + define_yeti_variable TEMPORARIES_PILE="$FEISTY_MEOW_GENERATED_STORE/temporaries" fi - if [ ! -d "$TEMPORARIES_DIR" ]; then - mkdir -p "$TEMPORARIES_DIR" + if [ ! -d "$TEMPORARIES_PILE" ]; then + mkdir -p "$TEMPORARIES_PILE" fi # similarly, make sure we have someplace to look for our generated files, if @@ -130,7 +129,20 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then fi ############## + + # set up the color_add variable which is a flag that lets ls know colors work. + + # test if we can use color in ls... + ls --help 2>&1 | grep -i -q color + if [ $? -eq 0 ]; then + export color_add='--color=auto' + else + export color_add= + fi + unset test_ls_colors + ############## + # umask sets a permission mask for all file creations. # this mask disallows writes by "group" and "others". umask 022 @@ -163,7 +175,7 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then # choose perl's IO over the ms-windows version so we can handle file # bytes properly. fi - + # iterate across our sub-directories and find the perl scripts. # this currently only looks one level down. for i in $FEISTY_MEOW_SCRIPTS/*; do @@ -183,19 +195,32 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then # set this so nechung can find its data. define_yeti_variable NECHUNG=$FEISTY_MEOW_APEX/infobase/fortunes.dat - # establish a pipe for less to see our beloved syntax highlighting. - define_yeti_variable LESSOPEN="| source-highlight -f esc -o STDOUT -i %s" +## # establish a pipe for less to see our beloved syntax highlighting. +## define_yeti_variable LESSOPEN="| source-highlight -f esc -o STDOUT -i %s" - # ensure we use the right kind of secure shell. -# define_yeti_variable CVS_RSH=$FEISTY_MEOW_SCRIPTS/security/ssh.sh -# define_yeti_variable GIT_SSH=$FEISTY_MEOW_SCRIPTS/security/ssh.sh - # the base checkout list is just to update feisty_meow. additional folder # names can be added in your customized scripts. the space at the end of # this variable is important and allows users to extend the list like: # define_yeti_variable REPOSITORY_DIR+="muppets configs" - define_yeti_variable REPOSITORY_LIST="feisty_meow " + # see the customize/fred folder for a live example. + define_yeti_variable REPOSITORY_LIST="$FEISTY_MEOW_APEX " + + # add in any active projects to the repository list. + if [ -d "$HOME/active" ]; then + REPOSITORY_LIST+="$(find "$HOME/active" -maxdepth 1 -mindepth 1 -type d) " + fi + # add in any site avenger applications that are in the apps folder. + if [ -d "$HOME/apps" ]; then + # first, simple projects. + REPOSITORY_LIST+="$(find "$HOME/apps" -iname "avenger5" -type d) " + # then, site avenger specific projects. + REPOSITORY_LIST+="$(find "$HOME/apps" -maxdepth 2 -mindepth 2 -iname "avenger5" -type d) " + fi + # the archive collections list is a set of directories that are major + # repositories of data which can be synched to backup drives. + define_yeti_variable ARCHIVE_COLLECTIONS_LIST= + # initializes the feisty meow build variables, if possible. function initialize_build_variables() { @@ -212,7 +237,7 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then # now augment the environment if we found our build variables. if [ $found_build_vars == 1 ]; then # the binary directory contains our collection of handy programs. - define_yeti_variable FEISTY_MEOW_BINARIES=$TARGETS_DIR + define_yeti_variable FEISTY_MEOW_BINARIES=$TARGETS_STORE # add binaries created within build to the path. define_yeti_variable PATH="$(dos_to_unix_path $FEISTY_MEOW_BINARIES):$PATH" # Shared libraries are located via this variable. @@ -241,14 +266,14 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then ############## - # set the SHUNIT_DIR so our shunit tests can find the codebase. - define_yeti_variable SHUNIT_DIR="$FEISTY_MEOW_SCRIPTS/shunit" + # set the SHUNIT_PATH so our shunit tests can find the codebase. + define_yeti_variable SHUNIT_PATH="$FEISTY_MEOW_SCRIPTS/shunit" ############## define_yeti_variable CORE_VARIABLES_LOADED=true - if [ ! -z "$SHELL_DEBUG" ]; then echo variables initialization ends....; fi + if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then echo variables initialization ends....; fi fi ############## @@ -263,7 +288,7 @@ for i in $FEISTY_MEOW_LOADING_DOCK/custom/*.sh; do # skip it if it's not real. continue; fi - if [ ! -z "$SHELL_DEBUG" ]; then + if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then echo "loading customization: $(basename $(dirname $i))/$(basename $i)" fi source "$i"