X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fvariables.sh;h=e66a3acaa4665ec23815006214f24b0b7a08ece8;hb=4204451f41c3b8c6b8e2abc0cbd8748bb02216ca;hp=6172635ce74833eadbf0d3a7bd1443de8b3c5b9d;hpb=29a9b52a5cf4ddd33ad5a9bed5381a6612e78f52;p=feisty_meow.git diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index 6172635c..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)" ############## @@ -241,15 +241,15 @@ 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_REPOS_SCAN if [ -z "$FEISTY_MEOW_REPOS_SCAN" ]; then - if [ -d "$HOME/apps" ]; then - define_yeti_variable FEISTY_MEOW_REPOS_SCAN="$HOME/apps" + 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_REPOS_SCAN and no default apps folder found in home." true