fix for ignored theme and repo names
authorChris Koeritz <fred@gruntose.com>
Thu, 1 Mar 2018 17:03:13 +0000 (12:03 -0500)
committerChris Koeritz <fred@gruntose.com>
Thu, 1 Mar 2018 17:03:13 +0000 (12:03 -0500)
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.

scripts/site_avenger/powerup.sh

index 3709bc301958a2ed52274f7d7fe07a77ec2c04d9..1c2b342562c00bf8968a8c01f138f22e2a372b86 100644 (file)
@@ -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"