From: Chris Koeritz <fred@gruntose.com>
Date: Thu, 1 Mar 2018 17:03:13 +0000 (-0500)
Subject: fix for ignored theme and repo names
X-Git-Tag: 2.140.110^2~20
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=a2f21d88510a3fcb6d20802bf1c717a733e9c2e5;p=feisty_meow.git

fix for ignored theme and repo names

if the override specified these and they were not provided on command line, then script previously would ignore settings from X.app file and go with default.
---

diff --git a/scripts/site_avenger/powerup.sh b/scripts/site_avenger/powerup.sh
index 3709bc30..1c2b3425 100644
--- a/scripts/site_avenger/powerup.sh
+++ b/scripts/site_avenger/powerup.sh
@@ -74,10 +74,16 @@ full_app_dir="$BASE_APPLICATION_PATH/$app_dirname"
 
 # use our default values for the repository and theme if they're not provided.
 if [ -z "$repo_name" ]; then
-  repo_name="$app_dirname"
+  repo_name="$REPO_NAME"
+  if [ -z "$repo_name" ]; then
+    repo_name="$app_dirname"
+  fi
 fi
 if [ -z "$theme_name" ]; then
-  theme_name="$(capitalize_first_char ${app_dirname})"
+  theme_name="$THEME_NAME"
+  if [ -z "$theme_name" ]; then
+    theme_name="$(capitalize_first_char ${app_dirname})"
+  fi
 fi
 
 echo "Repository: $repo_name"