X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fvariables.sh;h=fb03b6cd9cf28523f1ebe6839805ed61af4b023b;hb=2c17bf0495b27b67b0ba655b18fbb2f723071698;hp=b64b167098c89726696ab05b7edb3ebeddf51ea4;hpb=5eef50ad1056d7dc7ceb0be82fbdb4c71c0d0da4;p=feisty_meow.git diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index b64b1670..fb03b6cd 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/' + } + + ############## @@ -110,6 +119,11 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org 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" @@ -118,9 +132,7 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org 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 @@ -178,24 +190,30 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org # variables for perl. - define_yeti_variable PERLLIB+="/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 - # bytes properly. - fi + if [[ $PERLLIB =~ .*$FEISTY_MEOW_SCRIPTS.* ]]; then +#if debug! + echo skipping PERLLIB since already mentions feisty meow scripts. + else + define_yeti_variable PERLLIB+="/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 + # 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 - if [ -d "$i" ]; then - # check if there is a perl file present; add the folder to PERLLIB if so. - ls $i/*.pl &>/dev/null - if [ $? -eq 0 ]; then - PERLLIB+=":$(dos_to_unix_path $i)" + # iterate across our sub-directories and find the perl scripts. + # this currently only looks one level down. + for i in $FEISTY_MEOW_SCRIPTS/*; do + if [ -d "$i" ]; then + # check if there is a perl file present; add the folder to PERLLIB if so. + ls $i/*.pl &>/dev/null + if [ $? -eq 0 ]; then + PERLLIB+=":$(dos_to_unix_path $i)" + fi fi - fi - done + done + fi + define_yeti_variable PERL5LIB=$PERLLIB #echo PERLLIB is now $PERLLIB @@ -218,11 +236,13 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org 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 @@ -236,7 +256,7 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org # initializes the feisty meow build variables, if possible. function initialize_build_variables() { - found_build_vars=0 + local found_build_vars=nope # we need to know the feisty meow directory, or we bail. if [ -z "$FEISTY_MEOW_APEX" ]; then return; fi # pick from our expected generator folder, but make sure it's there... @@ -244,10 +264,10 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org if [ -f "$buildvars" ]; then # yep, that one looks good, so pull in the build defs. source "$buildvars" "$buildvars" - found_build_vars=1 + found_build_vars=true fi # now augment the environment if we found our build variables. - if [ $found_build_vars == 1 ]; then + if [ $found_build_vars == true ]; then # the binary directory contains our collection of handy programs. define_yeti_variable FEISTY_MEOW_BINARIES=$TARGETS_STORE # add binaries created within build to the path. @@ -274,12 +294,13 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org # 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" ############## # set the SHUNIT_PATH so our shunit tests can find the codebase. - define_yeti_variable SHUNIT_PATH="$FEISTY_MEOW_SCRIPTS/shunit" + define_yeti_variable SHUNIT_PATH="$FEISTY_MEOW_SCRIPTS/testkit/shunit" ############## @@ -311,31 +332,35 @@ 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 -if [ ! -z "$DISPLAY" ]; then - # only try to add bluefish, a gui editor, if there is an X display for it. - if [ -z "$EDITOR" ]; then - EDITOR="$(which bluefish)" - fi -fi +# 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)" + EDITOR="$(whichable 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)" + EDITOR="$(whichable vim)" fi if [ -z "$EDITOR" ]; then - EDITOR="$(which vi)" + EDITOR="$(whichable vi)" fi -## +if [ -z "$EDITOR" ]; then + EDITOR="$(whichable emacs)" +fi +#### # out of ideas about editors at this point. -## -# set the VISUAL variable from EDITOR if we found an editor to use. +#### +# 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 ##############