Don't check for build before releasing (plushu/plusku#2)

plushu · Aug 20, 2014 · 9cf0cb1 · 9cf0cb1
1 parent 1d0af36
commit 9cf0cb1
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 52 deletions.
diff --git a/command b/command
@@ -12,15 +12,16 @@ else
 fi
 
 app_dir=$PLUSHU_ROOT/apps/$app
-env_file=$app_dir/config.env
 
-# Check if app exists with the same name
-if [ ! -d "$app_dir" ]; then
-  echo "App $app does not exist" >&2
+# Check if app exists
+if [[ ! -d "$app_dir" ]]; then
+  echo "App not found: $app" >&2
   exit 1
 fi
 
-if [ ! -f "$env_file" ]; then
+env_file=$app_dir/config.env
+
+if [[ ! -f "$env_file" ]]; then
   touch "$env_file"
 fi
 

diff --git a/subcommands/empty b/subcommands/empty
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail; [[ -n "$PLUSHU_TRACE" ]] && set -x
 
 if [[ -n "$PLUSHU_APP_NAME" ]]; then
   app=$PLUSHU_APP_NAME
@@ -12,15 +12,16 @@ else
 fi
 
 app_dir=$PLUSHU_ROOT/apps/$app
-env_file=$app_dir/config.env
 
-# Check if app exists with the same name
-if [ ! -d "$app_dir" ]; then
-  echo "App $app does not exist" >&2
+# Check if app exists
+if [[ ! -d "$app_dir" ]]; then
+  echo "App not found: $app" >&2
   exit 1
 fi
 
-if [ ! -f "$env_file" ]; then
+env_file=$app_dir/config.env
+
+if [[ ! -f "$env_file" ]]; then
   touch "$env_file"
 fi
 
@@ -34,9 +35,6 @@ else
   > "$env_file"
 fi
 
-# If there is a build image to base a release on
-if [[ -f "$app_dir/build.iid" ]]; then
-  # Restart app with new configuration
-  "$PLUSHU_ROOT/lib/plushook" release-app "$app"
-  "$PLUSHU_ROOT/lib/plushook" deploy-app "$app"
-fi
+# Restart app with new configuration
+"$PLUSHU_ROOT/lib/plushook" release-app "$app"
+"$PLUSHU_ROOT/lib/plushook" deploy-app "$app"
diff --git a/subcommands/get b/subcommands/get
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail; [[ -n "$PLUSHU_TRACE" ]] && set -x
 
 if [[ -n "$PLUSHU_APP_NAME" ]]; then
   app=$PLUSHU_APP_NAME
@@ -12,15 +12,16 @@ else
 fi
 
 app_dir=$PLUSHU_ROOT/apps/$app
-env_file=$app_dir/config.env
 
-# Check if app exists with the same name
-if [ ! -d "$app_dir" ]; then
-  echo "App $app does not exist" >&2
+# Check if app exists
+if [[ ! -d "$app_dir" ]]; then
+  echo "App not found: $app" >&2
   exit 1
 fi
 
-if [ ! -f "$env_file" ]; then
+env_file=$app_dir/config.env
+
+if [[ ! -f "$env_file" ]]; then
   touch "$env_file"
 fi
 

diff --git a/subcommands/pretty b/subcommands/pretty
@@ -12,15 +12,16 @@ else
 fi
 
 app_dir=$PLUSHU_ROOT/apps/$app
-env_file=$app_dir/config.env
 
-# Check if app exists with the same name
-if [ ! -d "$app_dir" ]; then
-  echo "App $app does not exist" >&2
+# Check if app exists
+if [[ ! -d "$app_dir" ]]; then
+  echo "App not found: $app" >&2
   exit 1
 fi
 
-if [ ! -f "$env_file" ]; then
+env_file=$app_dir/config.env
+
+if [[ ! -f "$env_file" ]]; then
   touch "$env_file"
 fi
 

diff --git a/subcommands/set b/subcommands/set
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail; [[ -n "$PLUSHU_TRACE" ]] && set -x
 
 if [[ -n "$PLUSHU_APP_NAME" ]]; then
   app=$PLUSHU_APP_NAME
@@ -12,15 +12,16 @@ else
 fi
 
 app_dir=$PLUSHU_ROOT/apps/$app
-env_file=$app_dir/config.env
 
-# Check if app exists with the same name
-if [ ! -d "$app_dir" ]; then
-  echo "App $app does not exist" >&2
+# Check if app exists
+if [[ ! -d "$app_dir" ]]; then
+  echo "App not found: $app" >&2
   exit 1
 fi
 
-if [ ! -f "$env_file" ]; then
+env_file=$app_dir/config.env
+
+if [[ ! -f "$env_file" ]]; then
   touch "$env_file"
 fi
 
@@ -64,9 +65,7 @@ for pair in "${pairs[@]}"; do
   printf "$key=%q\n" "$value" >>"$env_file"
 done
 
-# If there is a build image to base a release on
-if [[ -f "$app_dir/build.iid" ]]; then
-  # Restart app with new configuration
-  "$PLUSHU_ROOT/lib/plushook" release-app "$app"
-  "$PLUSHU_ROOT/lib/plushook" deploy-app "$app"
-fi
+# Restart app with new configuration
+"$PLUSHU_ROOT/lib/plushook" release-app "$app"
+"$PLUSHU_ROOT/lib/plushook" deploy-app "$app"
+
diff --git a/subcommands/unset b/subcommands/unset
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail; [[ -n "$PLUSHU_TRACE" ]] && set -x
 
 if [[ -n "$PLUSHU_APP_NAME" ]]; then
   app=$PLUSHU_APP_NAME
@@ -12,15 +12,16 @@ else
 fi
 
 app_dir=$PLUSHU_ROOT/apps/$app
-env_file=$app_dir/config.env
 
-# Check if app exists with the same name
-if [ ! -d "$app_dir" ]; then
-  echo "App $app does not exist" >&2
+# Check if app exists
+if [[ ! -d "$app_dir" ]]; then
+  echo "App not found: $app" >&2
   exit 1
 fi
 
-if [ ! -f "$env_file" ]; then
+env_file=$app_dir/config.env
+
+if [[ ! -f "$env_file" ]]; then
   touch "$env_file"
 fi
 
@@ -46,9 +47,7 @@ for key in "${keys[@]}"; do
   sed -i "/^$key=/ d" "$env_file"
 done
 
-# If there is a build image to base a release on
-if [[ -f "$app_dir/build.iid" ]]; then
-  # Restart app with new configuration
-  "$PLUSHU_ROOT/lib/plushook" release-app "$app"
-  "$PLUSHU_ROOT/lib/plushook" deploy-app "$app"
-fi
+# Restart app with new configuration
+"$PLUSHU_ROOT/lib/plushook" release-app "$app"
+"$PLUSHU_ROOT/lib/plushook" deploy-app "$app"
+