X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fvariables.sh;h=8c21424f03e2333de834484c56a68f37101858e7;hb=3ccfc799c6e1bcc3c0b282797267a65aa7e4c714;hp=976c7898cbfd20ee14ffda97e0ee4443e9da05e9;hpb=bdcc716c3d4ef7c405e580aa68ca10fb6c107800;p=feisty_meow.git diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index 976c7898..8c21424f 100644 --- a/scripts/core/variables.sh +++ b/scripts/core/variables.sh @@ -9,8 +9,6 @@ ############## -#hmmm: moved from functions.sh; does that hose everything up? - # defines a variable within the feisty meow environment and remembers that # this is a new or modified definition. if the feisty meow codebase is # unloaded, then so are all the variables that were defined. @@ -30,6 +28,17 @@ return 0 } + # switches from an X:/ form to a /cygdrive/X/path form. this is only useful + # for the cygwin environment currently. + # defined here rather than in functions.sh since we need it when setting variables + # and cannot count on load order during a fresh startup in some circumstances. + function dos_to_unix_path() { + # we always remove dos slashes in favor of forward slashes. +#old: echo "$1" | sed -e 's/\\/\//g' | sed -e 's/\([a-zA-Z]\):\/\(.*\)/\/\1\/\2/' + echo "$1" | sed -e 's/\\/\//g' | sed -e 's/\([a-zA-Z]\):\/\(.*\)/\/cygdrive\/\1\/\2/' + } + + ############## @@ -56,6 +65,9 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then # start with some simpler things. +#hmmm: this needs to come from some configuration item. especially for installs. +define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org + define_yeti_variable SCRIPT_SYSTEM=feisty_meow # OS variable records the operating system we think we found. @@ -93,9 +105,12 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then # this is only used for extreme failure modes, when the values were not # pulled in from our auto-generated config. if [ -z "$FEISTY_MEOW_APEX" ]; then - if [ -d "$HOME/feisty_meow" ]; then + if [ -d "/opt/feistymeow.org/feisty_meow" ]; then + define_yeti_variable FEISTY_MEOW_APEX="/opt/feistymeow.org/feisty_meow" + define_yeti_variable FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_APEX/scripts" + elif [ -d "$HOME/feisty_meow" ]; then define_yeti_variable FEISTY_MEOW_APEX="$HOME/feisty_meow" - define_yeti_variable FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_SCRIPTS" + define_yeti_variable FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_APEX/scripts" fi fi @@ -104,6 +119,11 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then define_yeti_variable TMP=$HOME/.tmp fi + # set up our event logging file for any notable situation to be recorded in. + if [ -z "$FEISTY_MEOW_EVENT_LOG" ]; then + define_yeti_variable FEISTY_MEOW_EVENT_LOG="$TMP/$USER-feisty_meow-events.log" + fi + # set up the top-level for all build creations and logs and such. if [ -z "$FEISTY_MEOW_GENERATED_STORE" ]; then define_yeti_variable FEISTY_MEOW_GENERATED_STORE="$TMP/generated-feisty_meow" @@ -112,9 +132,7 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then mkdir -p "$FEISTY_MEOW_GENERATED_STORE" fi # set up our effluent outsourcing valves. - if [ -z "$TEMPORARIES_PILE" ]; then - define_yeti_variable TEMPORARIES_PILE="$FEISTY_MEOW_GENERATED_STORE/temporaries" - fi + define_yeti_variable TEMPORARIES_PILE="$FEISTY_MEOW_GENERATED_STORE/temporaries" if [ ! -d "$TEMPORARIES_PILE" ]; then mkdir -p "$TEMPORARIES_PILE" fi @@ -143,11 +161,15 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then ############## - # umask sets a permission mask for all file creations. - # this mask disallows writes by "group" and "others". - umask 022 - # this mask disallows writes by the "group" and disallows "others" completely. + # umask sets a permission mask for all file creations. we don't set this for the users any + # more; they should set it themselves. this is just documentation. + # + # this mask disallows writes by the "group" and disallows all permissions for "others". #umask 027 + # this mask disallows writes by "group" and "others". + #umask 022 + # this mask allows writes by "group" but not by "others". + #umask 002 # ulimit sets user limits. we set the maximum allowed core dump file size # to zero, because it is obnoxious to see the core dumps from crashed @@ -169,7 +191,6 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then # variables for perl. define_yeti_variable PERLLIB+="/usr/lib/perl5" - define_yeti_variable PERL5LIB+="/usr/lib/perl5" if [ "$OS" == "Windows_NT" ]; then define_yeti_variable PERLIO=:perlio # choose perl's IO over the ms-windows version so we can handle file @@ -184,10 +205,10 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then ls $i/*.pl &>/dev/null if [ $? -eq 0 ]; then PERLLIB+=":$(dos_to_unix_path $i)" - PERL5LIB+=":$(dos_to_unix_path $i)" fi fi done + define_yeti_variable PERL5LIB=$PERLLIB #echo PERLLIB is now $PERLLIB ############## @@ -209,17 +230,22 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then 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. + # add in any site avenger applications that are in the applications folder. if [ -d "$HOME/apps" ]; then - # first, simple projects. - REPOSITORY_LIST+="$(find "$HOME/apps" -iname "avenger5" -type d) " - # then, site avenger specific projects. + # general search for normal project folders in apps. + REPOSITORY_LIST+="$(find "$HOME/apps" -maxdepth 2 -mindepth 2 -iname ".git" -type d -exec dirname {} ';') " + REPOSITORY_LIST+="$(find "$HOME/apps" -maxdepth 2 -mindepth 2 -iname ".svn" -type d -exec dirname {} ';') " + + # special search for site avenger directories; they have avenger5 as second level. 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= + # the archive list is a set of directories that are major repositories of + # data which can be synched to backup drives. + define_yeti_variable MAJOR_ARCHIVE_SOURCES= + # the source collections list is a set of directories that indicate they + # harbor a lot of source code underneath. + define_yeti_variable SOURCECODE_HIERARCHY_LIST= # initializes the feisty meow build variables, if possible. function initialize_build_variables() @@ -262,7 +288,8 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then # add to the PATH variables used for locating applications. this step is taken after any # potential overrides from the user. - define_yeti_variable PATH="$(dos_to_unix_path $FEISTY_MEOW_LOADING_DOCK):$PATH:$(find /usr/local/games -maxdepth 1 -type d -exec echo -n {}: ';' 2>/dev/null)/sbin" +#old: define_yeti_variable PATH="$(dos_to_unix_path $FEISTY_MEOW_LOADING_DOCK):$PATH:$(find /usr/local/games -maxdepth 1 -type d -exec echo -n {}: ';' 2>/dev/null)/sbin" + define_yeti_variable PATH="$PATH:$(find /usr/local/games -maxdepth 1 -type d -exec echo -n {}: ';' 2>/dev/null)/sbin" ############## @@ -278,8 +305,8 @@ fi ############## -# pull in the custom overrides for feisty_meow scripts. this is done last, -# because we want to set everything up as expected, then let the user +# pull in the custom overrides for feisty_meow scripts. this is done almost +# last, because we want to set everything up as expected, then let the user # override individual variables and definitions. we also don't guard this # to avoid running it again, because we don't know what mix of functions and # aliases they want to define in there. @@ -294,3 +321,41 @@ for i in $FEISTY_MEOW_LOADING_DOCK/custom/*.sh; do source "$i" done +############## + +# a late breaking action is to set the editor, if we can. +# we will fallback to whatever we can find on the host. +export EDITOR +# note: the editors for revision control must wait while the document is +# edited, so gvim and others that launch a separate x window are not +# going to work well unless they can be prevented from forking the process +# off. +if [ -z "$EDITOR" ]; then + EDITOR="$(which gvim)" + if [ ! -z "$EDITOR" ]; then + # if we found gvim, then add in the no forking flag. + EDITOR+=" --nofork" + fi +fi +if [ -z "$EDITOR" ]; then + EDITOR="$(which vim)" +fi +if [ -z "$EDITOR" ]; then + EDITOR="$(which vi)" +fi +if [ -z "$EDITOR" ]; then + EDITOR="$(which emacs)" +fi +#### +# out of ideas about editors at this point. +#### +# set the VISUAL and other variables from EDITOR if we found an editor to use. +if [ ! -z "$EDITOR" ]; then + VISUAL="$EDITOR" + + export GIT_EDITOR="$EDITOR" + export SVN_EDITOR="$EDITOR" +fi + +############## +