From f367033a8784261b8317576e3a1977035ccdea63 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 13:38:03 +1300 Subject: [PATCH 1/4] keen4: Quote variable references ShellCheck SC2086. --- pkgs/games/keen4/builder.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/games/keen4/builder.sh b/pkgs/games/keen4/builder.sh index b5864b8392f5..3c9a1e9eb2d2 100644 --- a/pkgs/games/keen4/builder.sh +++ b/pkgs/games/keen4/builder.sh @@ -1,10 +1,11 @@ -source $stdenv/setup -mkdir -p $out/share/keen4 -unzip -j $dist -d $out/share/keen4 +source "$stdenv"/setup -mkdir -p $out/bin -cat > $out/bin/keen4 < "$out"/bin/keen4 < Date: Sun, 14 Nov 2021 13:48:21 +1300 Subject: [PATCH 2/4] keen4: Mark sourced file as unknown ShellCheck SC1091. --- pkgs/games/keen4/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/keen4/builder.sh b/pkgs/games/keen4/builder.sh index 3c9a1e9eb2d2..c59308429611 100644 --- a/pkgs/games/keen4/builder.sh +++ b/pkgs/games/keen4/builder.sh @@ -1,4 +1,5 @@ +# shellcheck source=/dev/null source "$stdenv"/setup mkdir -p "$out"/share/keen4 From 8737cb2cc4a9a36ebdfe899f04a83f084dcf3a4c Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 13:48:56 +1300 Subject: [PATCH 3/4] keen4: Add shebang line ShellCheck SC2148. --- pkgs/games/keen4/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/keen4/builder.sh b/pkgs/games/keen4/builder.sh index c59308429611..571cd5a9c4bc 100644 --- a/pkgs/games/keen4/builder.sh +++ b/pkgs/games/keen4/builder.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash # shellcheck source=/dev/null source "$stdenv"/setup From 6f70a225f4ca707d4f226e84df2a5ed622b87792 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 13:53:21 +1300 Subject: [PATCH 4/4] keen4: Fail script if variables are undefined ShellCheck SC2154. --- pkgs/games/keen4/builder.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/games/keen4/builder.sh b/pkgs/games/keen4/builder.sh index 571cd5a9c4bc..f39edc789995 100644 --- a/pkgs/games/keen4/builder.sh +++ b/pkgs/games/keen4/builder.sh @@ -1,13 +1,15 @@ #!/usr/bin/env bash +set -o nounset + # shellcheck source=/dev/null -source "$stdenv"/setup +source "${stdenv}/setup" -mkdir -p "$out"/share/keen4 -unzip -j "$dist" -d "$out"/share/keen4 +mkdir -p "${out}/share/keen4" +unzip -j "$dist" -d "${out}/share/keen4" -mkdir -p "$out"/bin -cat > "$out"/bin/keen4 < "${out}/bin/keen4" <