X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fcore%2Fvariables.sh;h=e66a3acaa4665ec23815006214f24b0b7a08ece8;hb=77e3aa021463bddde7b1219849b8911b1ee5c6f6;hp=5cc90f3e49347f5217c76525d877e5d5cb3aeb3f;hpb=433e814670acb50888d9d58b5f77cfa948b23aa9;p=feisty_meow.git diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index 5cc90f3e..e66a3aca 100644 --- a/scripts/core/variables.sh +++ b/scripts/core/variables.sh @@ -74,7 +74,7 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org if [ -z "$OS" ]; then define_yeti_variable OS=UNIX fi - define_yeti_variable IS_DARWIN=$(echo $OSTYPE | grep -i darwin) + define_yeti_variable IS_DARWIN="$(echo $OSTYPE | grep -i darwin)" ############## @@ -222,6 +222,12 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org # set this so nechung can find its data. define_yeti_variable NECHUNG=$FEISTY_MEOW_APEX/infobase/fortunes.dat + + # set a personal home directory that can be overridden. + define_yeti_variable FEISTY_MEOW_PERSONAL_HOME + if [ -z "$FEISTY_MEOW_PERSONAL_HOME" ]; then + define_yeti_variable FEISTY_MEOW_PERSONAL_HOME="$HOME" + fi ## # establish a pipe for less to see our beloved syntax highlighting. ## define_yeti_variable LESSOPEN="| source-highlight -f esc -o STDOUT -i %s" @@ -235,27 +241,28 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org # add in any active projects to the repository list. #hmmm: resolve if still using this folder. - if [ -d "$HOME/active" ]; then - REPOSITORY_LIST+="$(find "$HOME/active" -maxdepth 1 -mindepth 1 -type d) " + if [ -d "$FEISTY_MEOW_PERSONAL_HOME/active" ]; then + REPOSITORY_LIST+="$(find "$FEISTY_MEOW_PERSONAL_HOME/active" -maxdepth 1 -mindepth 1 -type d) " fi # add in any folders that are under the feisty meow applications folder. - define_yeti_variable FEISTY_MEOW_APPS_DIR - if [ -z "$FEISTY_MEOW_APPS_DIR" ]; then - if [ -d "$HOME/apps" ]; then - define_yeti_variable FEISTY_MEOW_APPS_DIR="$HOME/apps" + define_yeti_variable FEISTY_MEOW_REPOS_SCAN + if [ -z "$FEISTY_MEOW_REPOS_SCAN" ]; then + if [ -d "$FEISTY_MEOW_PERSONAL_HOME/apps" ]; then + define_yeti_variable FEISTY_MEOW_REPOS_SCAN="$FEISTY_MEOW_PERSONAL_HOME/apps" else -# echo "No value set for FEISTY_MEOW_APPS_DIR and no default apps folder found in home." +# echo "No value set for FEISTY_MEOW_REPOS_SCAN and no default apps folder found in home." true fi fi - if [ -d "$FEISTY_MEOW_APPS_DIR" ]; then + if [ -d "$FEISTY_MEOW_REPOS_SCAN" ]; then +#hmmm: handle the repos as if they are multi value!!! # general search for normal project folders in apps. - REPOSITORY_LIST+="$(find "$FEISTY_MEOW_APPS_DIR" -maxdepth 2 -mindepth 2 -iname ".git" -type d -exec dirname {} ';') " - REPOSITORY_LIST+="$(find "$FEISTY_MEOW_APPS_DIR" -maxdepth 2 -mindepth 2 -iname ".svn" -type d -exec dirname {} ';') " + REPOSITORY_LIST+="$(find "$FEISTY_MEOW_REPOS_SCAN" -maxdepth 2 -mindepth 2 -iname ".git" -type d -exec dirname {} ';') " + REPOSITORY_LIST+="$(find "$FEISTY_MEOW_REPOS_SCAN" -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 "$FEISTY_MEOW_APPS_DIR" -maxdepth 2 -mindepth 2 -iname "avenger5" -type d) " + REPOSITORY_LIST+="$(find "$FEISTY_MEOW_REPOS_SCAN" -maxdepth 2 -mindepth 2 -iname "avenger5" -type d) " fi # the archive list is a set of directories that are major repositories of