From 65543d103193c46abdb190808b671fa2c66dde42 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 30 Jan 2020 21:25:01 +0100 Subject: common-updater-scripts: clean up Fix issues reported by shellcheck and few other style issues. Though we need to ignore $systemArg complaints because Nix does not support passing --system as a single argument. --- pkgs/common-updater/scripts.nix | 4 +-- pkgs/common-updater/scripts/update-source-version | 38 +++++++++++------------ 2 files changed, 21 insertions(+), 21 deletions(-) (limited to 'pkgs/common-updater') diff --git a/pkgs/common-updater/scripts.nix b/pkgs/common-updater/scripts.nix index 1bec4a73996..ec897914b6b 100644 --- a/pkgs/common-updater/scripts.nix +++ b/pkgs/common-updater/scripts.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, coreutils, gawk, gnused, gnugrep, diffutils, nix }: +{ stdenv, makeWrapper, coreutils, gnused, gnugrep, diffutils, nix }: stdenv.mkDerivation { name = "common-updater-scripts"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { cp ${./scripts}/* $out/bin for f in $out/bin/*; do - wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk gnused gnugrep nix diffutils ]} + wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnused gnugrep nix diffutils ]} done ''; } diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 77245a1b1aa..f152877e098 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -26,7 +26,7 @@ for arg in "$@"; do ;; --file=*) nixFile="${arg#*=}" - if [ ! -f "$nixFile" ]; then + if [[ ! -f "$nixFile" ]]; then die "Could not find provided file $nixFile" fi ;; @@ -38,7 +38,7 @@ for arg in "$@"; do exit 0 ;; --*) - echo "$scriptName: Unknown argument: " $arg + echo "$scriptName: Unknown argument: $arg" usage exit 1 ;; @@ -53,25 +53,25 @@ newVersion=${args[1]} newHash=${args[2]} newUrl=${args[3]} -if [ "${#args[*]}" -lt 2 ]; then +if (( "${#args[*]}" < 2 )); then echo "$scriptName: Too few arguments" usage exit 1 fi -if [ "${#args[*]}" -gt 4 ]; then +if (( "${#args[*]}" > 4 )); then echo "$scriptName: Too many arguments" usage exit 1 fi -if [ -z "$versionKey" ]; then +if [[ -z "$versionKey" ]]; then versionKey=version fi -if [ -z "$nixFile" ]; then +if [[ -z "$nixFile" ]]; then nixFile=$(nix-instantiate $systemArg --eval --strict -A "$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') - if [ ! -f "$nixFile" ]; then + if [[ ! -f "$nixFile" ]]; then die "Couldn't evaluate '$attr.meta.position' to locate the .nix file!" fi fi @@ -79,28 +79,28 @@ fi oldHashAlgo=$(nix-instantiate $systemArg --eval --strict -A "$attr.src.drvAttrs.outputHashAlgo" | tr -d '"') oldHash=$(nix-instantiate $systemArg --eval --strict -A "$attr.src.drvAttrs.outputHash" | tr -d '"') -if [ -z "$oldHashAlgo" -o -z "$oldHash" ]; then +if [[ -z "$oldHashAlgo" || -z "$oldHash" ]]; then die "Couldn't evaluate old source hash from '$attr.src'!" fi -if [ $(grep -c "$oldHash" "$nixFile") != 1 ]; then +if [[ $(grep --count "$oldHash" "$nixFile") != 1 ]]; then die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!" fi oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; builtins.elemAt ($attr.src.drvAttrs.urls or [ $attr.src.url ]) 0" | tr -d '"') -if [ -z "$oldUrl" ]; then +if [[ -z "$oldUrl" ]]; then die "Couldn't evaluate source url from '$attr.src'!" fi drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; lib.getName $attr" | tr -d '"') oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (lib.getVersion $attr)" | tr -d '"') -if [ -z "$drvName" -o -z "$oldVersion" ]; then +if [[ -z "$drvName" || -z "$oldVersion" ]]; then die "Couldn't evaluate name and version from '$attr.name'!" fi -if [ "$oldVersion" = "$newVersion" ]; then +if [[ "$oldVersion" = "$newVersion" ]]; then echo "$scriptName: New version same as old version, nothing to do." >&2 exit 0 fi @@ -109,9 +109,9 @@ fi oldVersionEscaped=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g') oldUrlEscaped=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g') -if [ $(grep -c -E "^\s*(let\b)?\s*$versionKey\s*=\s*\"$oldVersionEscaped\"" "$nixFile") = 1 ]; then +if [[ $(grep --count --extended-regexp "^\s*(let\b)?\s*$versionKey\s*=\s*\"$oldVersionEscaped\"" "$nixFile") = 1 ]]; then pattern="/\b$versionKey\b\s*=/ s|\"$oldVersionEscaped\"|\"$newVersion\"|" -elif [ $(grep -c -E "^\s*(let\b)?\s*name\s*=\s*\"[^\"]+-$oldVersionEscaped\"" "$nixFile") = 1 ]; then +elif [[ $(grep --count --extended-regexp "^\s*(let\b)?\s*name\s*=\s*\"[^\"]+-$oldVersionEscaped\"" "$nixFile") = 1 ]]; then pattern="/\bname\b\s*=/ s|-$oldVersionEscaped\"|-$newVersion\"|" else die "Couldn't figure out where out where to patch in new version in '$attr'!" @@ -124,7 +124,7 @@ if cmp -s "$nixFile" "$nixFile.bak"; then fi # Replace new URL -if [ -n "$newUrl" ]; then +if [[ -n "$newUrl" ]]; then sed -i "$nixFile" -re "s|\"$oldUrlEscaped\"|\"$newUrl\"|" if cmp -s "$nixFile" "$nixFile.bak"; then @@ -165,10 +165,10 @@ if cmp -s "$nixFile" "$nixFile.bak"; then fi # If new hash not given on the command line, recalculate it ourselves. -if [ -z "$newHash" ]; then +if [[ -z "$newHash" ]]; then nix-build $systemArg --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true # FIXME: use nix-build --hash here once https://github.com/NixOS/nix/issues/1172 is fixed - newHash=$(egrep -v "killing process|dependencies couldn't be built|wanted: " "$attr.fetchlog" | tail -n2 | sed "s~output path .* has .* hash ‘\(.*\)’ when .* was expected\|fixed-output derivation produced path '.*' with .* hash '\(.*\)' instead of the expected hash '.*'\| got: .*:\(.*\)~\1\2\3~" | head -n1) + newHash=$(grep --extended-regexp --invert-match "killing process|dependencies couldn't be built|wanted: " "$attr.fetchlog" | tail -n2 | sed "s~output path .* has .* hash ‘\(.*\)’ when .* was expected\|fixed-output derivation produced path '.*' with .* hash '\(.*\)' instead of the expected hash '.*'\| got: .*:\(.*\)~\1\2\3~" | head -n1) fi if [[ -n "$sri" ]]; then @@ -176,12 +176,12 @@ if [[ -n "$sri" ]]; then newHash="$(nix to-sri --type "$oldHashAlgo" "$newHash")" fi -if [ -z "$newHash" ]; then +if [[ -z "$newHash" ]]; then cat "$attr.fetchlog" >&2 die "Couldn't figure out new hash of '$attr.src'!" fi -if [ -z "${ignoreSameHash}" ] && [ "$oldVersion" != "$newVersion" ] && [ "$oldHash" = "$newHash" ]; then +if [[ -z "${ignoreSameHash}" && "$oldVersion" != "$newVersion" && "$oldHash" = "$newHash" ]]; then mv "$nixFile.bak" "$nixFile" die "Both the old and new source hashes of '$attr.src' were equivalent. Please fix the package's source URL to be dependent on '\${version}'!" fi -- cgit 1.4.1