Move get and set actions into functions

plugins/config/commands

@@ -27,75 +27,11 @@ case "$1" in
     ;;
 
   config:get)
-    config_parse_args "$@"
-
-    if [[ -z $3 ]]; then
-      echo "Usage: dokku config:get APP KEY"
-      echo "Must specify KEY."
-      exit 1
-    fi
-
-    config_create "$ENV_FILE"
-    if [[ ! -s $ENV_FILE ]] ; then
-      exit 0
-    fi
-
-    KEY="$3"
-
-    grep -Eo "export ([a-zA-Z_][a-zA-Z0-9_]*=.*)" $ENV_FILE | grep "^export $KEY=" | cut -d"=" -f2- | sed -e "s/^'//" -e "s/'$//"
+    config_get "$@"
     ;;
 
   config:set)
-    config_parse_args "$@"
-    [[ "$2" = "--no-restart" ]] && set -- "${@:1:1}" "${@:3}"
-
-    if [[ -z "${*:3}" ]]; then
-      echo "Usage: dokku config:set APP KEY1=VALUE1 [KEY2=VALUE2 ...]"
-      echo "Must specify KEY and VALUE to set."
-      exit 1
-    fi
-
-    config_create "$ENV_FILE"
-    ENV_ADD=""
-    ENV_TEMP=$(cat "${ENV_FILE}")
-    RESTART_APP=false
-    shift 2
-
-    for var; do
-      if [[ $var != *"="* ]]; then
-        echo "Usage: dokku config:set APP KEY1=VALUE1 [KEY2=VALUE2 ...]"
-        echo "Must specify KEY and VALUE to set."
-        exit 1
-      fi
-    done
-
-    for var; do
-      KEY=$(echo ${var} | cut -d"=" -f1)
-      VALUE=$(echo ${var} | cut -d"=" -f2-)
-
-      if [[ $KEY =~ [a-zA-Z_][a-zA-Z0-9_]* ]]; then
-        RESTART_APP=true
-        ENV_TEMP=$(echo "${ENV_TEMP}" | sed "/^export $KEY=/ d")
-        ENV_TEMP="${ENV_TEMP}
-export $KEY='$VALUE'"
-        ENV_ADD=$(echo -e "${ENV_ADD}" | sed "/^$KEY=/ d")
-        ENV_ADD="${ENV_ADD}$
-${var}"
-      fi
-    done
-    ENV_ADD=$(echo "$ENV_ADD" | tail -n +2) #remove first empty line
-
-    if [ $RESTART_APP ]; then
-      dokku_log_info1 "Setting config vars"
-      config_styled_hash "$ENV_ADD" "       "
-
-      config_write "$ENV_TEMP"
-    fi
-
-    if [[ "$DOKKU_CONFIG_RESTART" == "true" ]]; then
-      dokku_log_info1 "Restarting app $APP"
-      dokku ps:restart $APP
-    fi
+    config_set "$@"
     ;;
 
   config:unset)

plugins/config/functions

@@ -97,3 +97,77 @@ is_config_export() {
   done
   return 1
 }
+
+config_get() {
+  [[ "$1" == "config:get" ]] || set -- "config:get" "$@"
+  config_parse_args "$@"
+
+  if [[ -z $3 ]]; then
+    echo "Usage: dokku config:get APP KEY"
+    echo "Must specify KEY."
+    exit 1
+  fi
+
+  config_create "$ENV_FILE"
+  if [[ ! -s $ENV_FILE ]] ; then
+    exit 0
+  fi
+
+  KEY="$3"
+
+  grep -Eo "export ([a-zA-Z_][a-zA-Z0-9_]*=.*)" $ENV_FILE | grep "^export $KEY=" | cut -d"=" -f2- | sed -e "s/^'//" -e "s/'$//"
+}
+
+config_set() {
+  [[ "$1" == "config:set" ]] || set -- "config:set" "$@"
+  config_parse_args "$@"
+  [[ "$2" = "--no-restart" ]] && set -- "${@:1:1}" "${@:3}"
+
+  if [[ -z "${*:3}" ]]; then
+    echo "Usage: dokku config:set APP KEY1=VALUE1 [KEY2=VALUE2 ...]"
+    echo "Must specify KEY and VALUE to set."
+    exit 1
+  fi
+
+  config_create "$ENV_FILE"
+  ENV_ADD=""
+  ENV_TEMP=$(cat "${ENV_FILE}")
+  RESTART_APP=false
+  shift 2
+
+  for var; do
+    if [[ $var != *"="* ]]; then
+      echo "Usage: dokku config:set APP KEY1=VALUE1 [KEY2=VALUE2 ...]"
+      echo "Must specify KEY and VALUE to set."
+      exit 1
+    fi
+  done
+
+  for var; do
+    KEY=$(echo ${var} | cut -d"=" -f1)
+    VALUE=$(echo ${var} | cut -d"=" -f2-)
+
+    if [[ $KEY =~ [a-zA-Z_][a-zA-Z0-9_]* ]]; then
+      RESTART_APP=true
+      ENV_TEMP=$(echo "${ENV_TEMP}" | sed "/^export $KEY=/ d")
+      ENV_TEMP="${ENV_TEMP}
+export $KEY='$VALUE'"
+      ENV_ADD=$(echo -e "${ENV_ADD}" | sed "/^$KEY=/ d")
+      ENV_ADD="${ENV_ADD}$
+${var}"
+    fi
+  done
+  ENV_ADD=$(echo "$ENV_ADD" | tail -n +2) #remove first empty line
+
+  if [ $RESTART_APP ]; then
+    dokku_log_info1 "Setting config vars"
+    config_styled_hash "$ENV_ADD" "       "
+
+    config_write "$ENV_TEMP"
+  fi
+
+  if [[ "$DOKKU_CONFIG_RESTART" == "true" ]]; then
+    dokku_log_info1 "Restarting app $APP"
+    dokku ps:restart $APP
+  fi
+}