diff --git a/ci/release/build_docker.sh b/ci/release/build_docker.sh index e9d331800..7c3751af2 100755 --- a/ci/release/build_docker.sh +++ b/ci/release/build_docker.sh @@ -7,7 +7,7 @@ tag="$(sh_c docker build \ --build-arg GOVERSION="1.19.3.linux-$ARCH" \ -qf ./ci/release/builders/Dockerfile ./ci/release/builders)" docker_run \ - -e DRYRUN \ + -e DRY_RUN \ -e HW_BUILD_DIR \ -e VERSION \ -e OS \ diff --git a/ci/release/template/README.md.sh b/ci/release/template/README.md.sh index 84a0c01c2..880483016 100755 --- a/ci/release/template/README.md.sh +++ b/ci/release/template/README.md.sh @@ -11,7 +11,7 @@ version: $VERSION ## Install \`\`\`sh -make install PREFIX=/usr/local DRYRUN=1 +make install PREFIX=/usr/local DRY_RUN=1 # If it looks right, run: make install PREFIX=/usr/local \`\`\` @@ -19,7 +19,7 @@ make install PREFIX=/usr/local ## Uninstall \`\`\`sh -make uninstall PREFIX=/usr/local DRYRUN=1 +make uninstall PREFIX=/usr/local DRY_RUN=1 # If it looks right, run: make uninstall PREFIX=/usr/local \`\`\` diff --git a/ci/release/template/scripts/lib.sh b/ci/release/template/scripts/lib.sh index 074eb3a91..95244284d 100644 --- a/ci/release/template/scripts/lib.sh +++ b/ci/release/template/scripts/lib.sh @@ -127,7 +127,7 @@ logcat() { sh_c() { COLOR=3 logp exec "$*" - if [ -z "${DRYRUN-}" ]; then + if [ -z "${DRY_RUN-}" ]; then "$@" fi } diff --git a/install.sh b/install.sh index 958ed355b..8c8a11f2a 100755 --- a/install.sh +++ b/install.sh @@ -162,7 +162,7 @@ warnf() { sh_c() { COLOR=3 logp exec "$*" - if [ -z "${DRYRUN-}" ]; then + if [ -z "${DRY_RUN-}" ]; then eval "$@" fi } @@ -271,9 +271,9 @@ flag_parse() { -*=*) # Remove everything after first equal sign. FLAG="${1%%=*}" - FLAGRAW="$FLAG" # Remove leading hyphens. FLAG="${FLAG#-}"; FLAG="${FLAG#-}" + FLAGRAW="$(flag_fmt)" # Remove everything before first equal sign. FLAGARG="${1#*=}" FLAGSHIFT=1 @@ -293,7 +293,7 @@ flag_parse() { -*) # Remove leading hyphens. FLAG="${1#-}"; FLAG="${FLAG#-}" - FLAGRAW=$1 + FLAGRAW=$(flag_fmt) unset FLAGARG FLAGSHIFT=1 if [ $# -gt 1 ]; then @@ -351,6 +351,14 @@ Run with --help for usage. EOF return 1 } + +flag_fmt() { + if [ "$(printf %s "$FLAG" | wc -c)" -eq 1 ]; then + echo "-$FLAG" + else + echo "--$FLAG" + fi +} #!/bin/sh set -eu @@ -362,7 +370,7 @@ help() { fi cat <