From 0ab9e2a36a6e240bfaac507caa9ec47d940adcfa Mon Sep 17 00:00:00 2001 From: Richard Alpe Date: Mon, 7 Apr 2025 14:57:17 +0200 Subject: [PATCH] confd: fix indentation of bin/migrate Don't mix tabs and spaces. Signed-off-by: Richard Alpe --- src/confd/bin/migrate | 138 +++++++++++++++++++++--------------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/src/confd/bin/migrate b/src/confd/bin/migrate index 41b29c3d..e04b503a 100755 --- a/src/confd/bin/migrate +++ b/src/confd/bin/migrate @@ -27,7 +27,7 @@ cleanup() note() { if [ -n "$quiet" ]; then - return + return fi logger -I $$ -k -p user.notice -t "$ident" "$1" } @@ -46,11 +46,11 @@ atoi() file_version() { jq -r ' - if .["infix-meta:meta"] | has("version") then - .["infix-meta:meta"]["version"] - else - "0.0" - end + if .["infix-meta:meta"] | has("version") then + .["infix-meta:meta"]["version"] + else + "0.0" + end ' "$1" } @@ -58,16 +58,16 @@ file_version() confd_version() { find "$scripts" -mindepth 1 -maxdepth 1 -type d \ - | sort -V | tail -n1 | xargs -n1 basename -} + | sort -V | tail -n1 | xargs -n1 basename + } # Update meta data with the latest version meta_version() { if jq --arg version "$sys_version" '.["infix-meta:meta"] = {"infix-meta:version": $version}' "$2" \ - > "${2}.tmp" && mv "${2}.tmp" "$2"; then - note "$1: configuration updated to version $sys_version." - return 0 + > "${2}.tmp" && mv "${2}.tmp" "$2"; then + note "$1: configuration updated to version $sys_version." + return 0 fi err "$1: failed updating configuration to version $sys_version!" @@ -80,23 +80,23 @@ migrate() note "$1: migrating from version $cfg_version" for version_dir in $(find "$scripts" -mindepth 1 -maxdepth 1 -type d | sort -V); do - dir=$(basename "$version_dir") - version=$(atoi "$dir") + dir=$(basename "$version_dir") + version=$(atoi "$dir") - # Step by step upgrade file to latest version - if [ "$cfg_level" -lt "$version" ]; then - note "Applying migrations for version $dir ..." + # Step by step upgrade file to latest version + if [ "$cfg_level" -lt "$version" ]; then + note "Applying migrations for version $dir ..." - # Apply all scripts in the version directory in order - for script in $(find "$version_dir" -type f -name '*.sh' | sort -V); do - note "$1: calling $script ..." - sh "$script" "$2" - done + # Apply all scripts in the version directory in order + for script in $(find "$version_dir" -type f -name '*.sh' | sort -V); do + note "$1: calling $script ..." + sh "$script" "$2" + done - # File now at $version ... - cfg_level="$version" - fi - done + # File now at $version ... + cfg_level="$version" + fi +done } # Try migrating a copy, then diff the files, for factory-config check @@ -126,31 +126,31 @@ eval set -- "$OPTS" while [ -n "$1" ]; do case $1 in - -b) - bak=$2 - shift - ;; - -c) - check=1 - ;; - -h) - usage - exit 0 - ;; - -i) - inplace=1 - ;; - -q) - quiet=1 - ;; - --) - shift - break - ;; - *) - # Likely file argument - break - ;; + -b) + bak=$2 + shift + ;; + -c) + check=1 + ;; + -h) + usage + exit 0 + ;; + -i) + inplace=1 + ;; + -q) + quiet=1 + ;; + --) + shift + break + ;; + *) + # Likely file argument + break + ;; esac shift done @@ -190,22 +190,22 @@ if [ "$cfg_level" -eq "$sys_level" ]; then exit 0 else if [ -n "$check" ]; then - # We may be called to check a file without meta:version (factory) - if [ "$cfg_version" = "0.0" ]; then - if diff "$tmp"; then - # File is OK, despite lacking meta:version - exit 0 - fi - msg="$orig: has syntax error, requires migrating." - else - msg="$orig: version $cfg_version, requires migrating." - fi - if [ -t 0 ]; then - echo "$msg" - else - note "$msg" - fi - exit 1 + # We may be called to check a file without meta:version (factory) + if [ "$cfg_version" = "0.0" ]; then + if diff "$tmp"; then + # File is OK, despite lacking meta:version + exit 0 + fi + msg="$orig: has syntax error, requires migrating." + else + msg="$orig: version $cfg_version, requires migrating." + fi + if [ -t 0 ]; then + echo "$msg" + else + note "$msg" + fi + exit 1 fi fi @@ -214,10 +214,10 @@ if [ -n "$bak" ]; then ext="${bak##*.}" bak="${fil}-${cfg_version}.${ext}" if cp -p "$tmp" "$bak" 2>/dev/null; then - note "$orig: backup created: $bak" + note "$orig: backup created: $bak" else - err "$orig: failed creating backup: $bak" - exit 1 + err "$orig: failed creating backup: $bak" + exit 1 fi fi