X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fvariables.sh;h=962535f11626c4fc9f75fab0f92b98cbb282a56a;hb=dfdb68204f1df5ce47e352034440403aef6c45f6;hp=1be1278dddbb2bb9072ea0bc64b9057a0131a46e;hpb=22bbd7c6d7bbb09a5ba955d30ceebf93693d23fb;p=feisty_meow.git diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index 1be1278d..962535f1 100644 --- a/scripts/core/variables.sh +++ b/scripts/core/variables.sh @@ -106,18 +106,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 "$GENERATED_STORE" ]; then + define_yeti_variable GENERATED_STORE="$TMP/generated-feisty_meow" fi - if [ ! -d "$GENERATED_DIR" ]; then - mkdir -p "$GENERATED_DIR" + if [ ! -d "$GENERATED_STORE" ]; then + mkdir -p "$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="$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 +130,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 +176,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,6 +196,9 @@ 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" + # 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 @@ -191,8 +207,13 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then # 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= + # 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() { @@ -209,7 +230,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. @@ -238,8 +259,8 @@ 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" ##############