From b01d371c46a15ba98ef7f662e459c80b2c55e207 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 31 Aug 2015 23:08:28 -0400 Subject: [PATCH] Move all functions into config/functions --- plugins/config/commands | 47 ---------------------------------------- plugins/config/functions | 47 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/plugins/config/commands b/plugins/config/commands index 99ca9de57..3d08f2d51 100755 --- a/plugins/config/commands +++ b/plugins/config/commands @@ -3,53 +3,6 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x source "$PLUGIN_PATH/common/functions" source "$PLUGIN_PATH/config/functions" -config_styled_hash () { - vars="$1" - prefix="$2" - - longest="" - while read -r word; do - KEY=$(echo $word | cut -d"=" -f1) - if [ ${#KEY} -gt ${#longest} ]; then - longest=$KEY - fi - done <<< "$vars" - - while read -r word; do - KEY=$(echo $word | cut -d"=" -f1) - VALUE=$(echo $word | cut -d"=" -f2- | sed -e "s/^'//" -e "s/'$//" -e "s/\$$//g") - - num_zeros=$((${#longest} - ${#KEY})) - zeros=" " - while [ $num_zeros -gt 0 ]; do - zeros="$zeros " - num_zeros=$((num_zeros - 1)) - done - echo "$prefix$KEY:$zeros$VALUE" - done <<< "$vars" -} - -config_write() { - ENV_TEMP="$1" - ENV_FILE_TEMP="${ENV_FILE}.tmp" - - echo "$ENV_TEMP" | sed '/^$/d' | sort > $ENV_FILE_TEMP - if ! cmp -s $ENV_FILE $ENV_FILE_TEMP; then - cp -f $ENV_FILE_TEMP $ENV_FILE - chmod 600 $ENV_FILE - fi - rm -f $ENV_FILE_TEMP -} - -is_config_export() { - for var in "$@"; do - if [[ "$var" == "--export" ]]; then - return 0 - fi - done - return 1 -} - case "$1" in config) config_parse_args "$@" diff --git a/plugins/config/functions b/plugins/config/functions index 888c776b6..a71f58b02 100644 --- a/plugins/config/functions +++ b/plugins/config/functions @@ -50,3 +50,50 @@ config_create () { local ENV_FILE=$1 [ -f $ENV_FILE ] || touch $ENV_FILE } + +config_styled_hash () { + local vars="$1" + local prefix="$2" + local longest="" + + while read -r word; do + KEY=$(echo $word | cut -d"=" -f1) + if [ ${#KEY} -gt ${#longest} ]; then + longest=$KEY + fi + done <<< "$vars" + + while read -r word; do + KEY=$(echo $word | cut -d"=" -f1) + VALUE=$(echo $word | cut -d"=" -f2- | sed -e "s/^'//" -e "s/'$//" -e "s/\$$//g") + + num_zeros=$((${#longest} - ${#KEY})) + zeros=" " + while [ $num_zeros -gt 0 ]; do + zeros="$zeros " + num_zeros=$((num_zeros - 1)) + done + echo "$prefix$KEY:$zeros$VALUE" + done <<< "$vars" +} + +config_write() { + local ENV_TEMP="$1" + local ENV_FILE_TEMP="${ENV_FILE}.tmp" + + echo "$ENV_TEMP" | sed '/^$/d' | sort > $ENV_FILE_TEMP + if ! cmp -s $ENV_FILE $ENV_FILE_TEMP; then + cp -f $ENV_FILE_TEMP $ENV_FILE + chmod 600 $ENV_FILE + fi + rm -f $ENV_FILE_TEMP +} + +is_config_export() { + for var in "$@"; do + if [[ "$var" == "--export" ]]; then + return 0 + fi + done + return 1 +}