From 00800f50b95b01466a5775b66417bb9174e4b012 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 13:56:01 +1300 Subject: [PATCH 001/360] bash: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/shells/bash/update-patch-set.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/shells/bash/update-patch-set.sh b/pkgs/shells/bash/update-patch-set.sh index 03b00228822d0..087904affdacb 100755 --- a/pkgs/shells/bash/update-patch-set.sh +++ b/pkgs/shells/bash/update-patch-set.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell --pure -i bash -p wget -p gnupg -p cacert -p nix +# shellcheck shell=bash # Update patch set for GNU Bash or Readline. From e85227d44d528036169e753e1166887e2baac0a6 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:09:28 +1300 Subject: [PATCH 002/360] netpbm: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/graphics/netpbm/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/graphics/netpbm/update.sh b/pkgs/tools/graphics/netpbm/update.sh index 670e872e951d2..d3f7d2d9169a3 100755 --- a/pkgs/tools/graphics/netpbm/update.sh +++ b/pkgs/tools/graphics/netpbm/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -p bash -p subversion -p common-updater-scripts -i bash +# shellcheck shell=bash die() { echo "error: $1" >&2 From 9147cb36dcb40ba45a15e27b3b510d08a09f2310 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:17:48 +1300 Subject: [PATCH 003/360] setup-hooks: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/build-support/setup-hooks/audit-blas.sh | 1 + pkgs/build-support/setup-hooks/audit-tmpdir.sh | 1 + pkgs/build-support/setup-hooks/autoreconf.sh | 1 + pkgs/build-support/setup-hooks/breakpoint-hook.sh | 1 + pkgs/build-support/setup-hooks/canonicalize-jars.sh | 1 + pkgs/build-support/setup-hooks/compress-man-pages.sh | 1 + pkgs/build-support/setup-hooks/die.sh | 1 + .../setup-hooks/enable-coverage-instrumentation.sh | 1 + pkgs/build-support/setup-hooks/find-xml-catalogs.sh | 1 + pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh | 1 + pkgs/build-support/setup-hooks/gog-unpack.sh | 1 + pkgs/build-support/setup-hooks/keep-build-tree.sh | 1 + pkgs/build-support/setup-hooks/ld-is-cc-hook.sh | 1 + .../build-support/setup-hooks/make-coverage-analysis-report.sh | 1 + pkgs/build-support/setup-hooks/make-symlinks-relative.sh | 1 + pkgs/build-support/setup-hooks/make-wrapper.sh | 1 + pkgs/build-support/setup-hooks/move-docs.sh | 2 +- pkgs/build-support/setup-hooks/move-lib64.sh | 1 + pkgs/build-support/setup-hooks/move-sbin.sh | 1 + pkgs/build-support/setup-hooks/multiple-outputs.sh | 1 + pkgs/build-support/setup-hooks/patch-shebangs.sh | 1 + pkgs/build-support/setup-hooks/prune-libtool-files.sh | 1 + pkgs/build-support/setup-hooks/reproducible-builds.sh | 1 + pkgs/build-support/setup-hooks/role.bash | 1 + pkgs/build-support/setup-hooks/separate-debug-info.sh | 1 + pkgs/build-support/setup-hooks/set-java-classpath.sh | 1 + .../setup-hooks/set-source-date-epoch-to-latest.sh | 1 + pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh | 1 + pkgs/build-support/setup-hooks/shorten-perl-shebang.sh | 1 + pkgs/build-support/setup-hooks/strip.sh | 1 + .../setup-hooks/update-autotools-gnu-config-scripts.sh | 1 + pkgs/build-support/setup-hooks/use-old-cxx-abi.sh | 1 + pkgs/build-support/setup-hooks/validate-pkg-config.sh | 1 + pkgs/build-support/setup-hooks/win-dll-link.sh | 3 +-- 34 files changed, 34 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/setup-hooks/audit-blas.sh b/pkgs/build-support/setup-hooks/audit-blas.sh index 6a40073fb2345..b510683bd0988 100644 --- a/pkgs/build-support/setup-hooks/audit-blas.sh +++ b/pkgs/build-support/setup-hooks/audit-blas.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Ensure that we are always linking against “libblas.so.3” and # “liblapack.so.3”. diff --git a/pkgs/build-support/setup-hooks/audit-tmpdir.sh b/pkgs/build-support/setup-hooks/audit-tmpdir.sh index c9dd32d1dd221..a999ffb5d50ce 100644 --- a/pkgs/build-support/setup-hooks/audit-tmpdir.sh +++ b/pkgs/build-support/setup-hooks/audit-tmpdir.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Check whether RPATHs or wrapper scripts contain references to # $TMPDIR. This is a serious security bug because it allows any user # to inject files into search paths of other users' processes. diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/pkgs/build-support/setup-hooks/autoreconf.sh index 6ce879ac092de..4ba4025a02e68 100644 --- a/pkgs/build-support/setup-hooks/autoreconf.sh +++ b/pkgs/build-support/setup-hooks/autoreconf.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash preConfigurePhases="${preConfigurePhases:-} autoreconfPhase" autoreconfPhase() { diff --git a/pkgs/build-support/setup-hooks/breakpoint-hook.sh b/pkgs/build-support/setup-hooks/breakpoint-hook.sh index 6bef786ac3ac6..c6742bf43abc5 100644 --- a/pkgs/build-support/setup-hooks/breakpoint-hook.sh +++ b/pkgs/build-support/setup-hooks/breakpoint-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash breakpointHook() { local red='\033[0;31m' local no_color='\033[0m' diff --git a/pkgs/build-support/setup-hooks/canonicalize-jars.sh b/pkgs/build-support/setup-hooks/canonicalize-jars.sh index 8c55810748ea0..90f1a7446be1e 100644 --- a/pkgs/build-support/setup-hooks/canonicalize-jars.sh +++ b/pkgs/build-support/setup-hooks/canonicalize-jars.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # This setup hook causes the fixup phase to repack all JAR files in a # canonical & deterministic fashion, e.g. resetting mtimes (like with normal # store files) and avoiding impure metadata. diff --git a/pkgs/build-support/setup-hooks/compress-man-pages.sh b/pkgs/build-support/setup-hooks/compress-man-pages.sh index 0d8a76558026e..46f5bebfcf39a 100644 --- a/pkgs/build-support/setup-hooks/compress-man-pages.sh +++ b/pkgs/build-support/setup-hooks/compress-man-pages.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash fixupOutputHooks+=('if [ -z "${dontGzipMan-}" ]; then compressManPages "$prefix"; fi') compressManPages() { diff --git a/pkgs/build-support/setup-hooks/die.sh b/pkgs/build-support/setup-hooks/die.sh index 0db41e030f4c2..d5d59cf8e3695 100644 --- a/pkgs/build-support/setup-hooks/die.sh +++ b/pkgs/build-support/setup-hooks/die.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Exit with backtrace and error message # # Usage: die "Error message" diff --git a/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh b/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh index 2b48fea4ff0bf..81e67f8ddd844 100644 --- a/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh +++ b/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash postPhases+=" cleanupBuildDir" # Force GCC to build with coverage instrumentation. Also disable diff --git a/pkgs/build-support/setup-hooks/find-xml-catalogs.sh b/pkgs/build-support/setup-hooks/find-xml-catalogs.sh index f446a6f27fd9c..848170b7dbab0 100644 --- a/pkgs/build-support/setup-hooks/find-xml-catalogs.sh +++ b/pkgs/build-support/setup-hooks/find-xml-catalogs.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addXMLCatalogs () { local d i # ‘xml/dtd’ and ‘xml/xsl’ are deprecated. Catalogs should be diff --git a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh index 55e196e654dff..a022facb2dfdb 100644 --- a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh +++ b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # On macOS, binaries refer to dynamic library dependencies using # either relative paths (e.g. "libicudata.dylib", searched relative to # $DYLD_LIBRARY_PATH) or absolute paths diff --git a/pkgs/build-support/setup-hooks/gog-unpack.sh b/pkgs/build-support/setup-hooks/gog-unpack.sh index 559b543fadfce..2fdb7eb108f5a 100644 --- a/pkgs/build-support/setup-hooks/gog-unpack.sh +++ b/pkgs/build-support/setup-hooks/gog-unpack.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash unpackPhase="unpackGog" unpackGog() { diff --git a/pkgs/build-support/setup-hooks/keep-build-tree.sh b/pkgs/build-support/setup-hooks/keep-build-tree.sh index 754900bfc337a..c2b1396a56891 100644 --- a/pkgs/build-support/setup-hooks/keep-build-tree.sh +++ b/pkgs/build-support/setup-hooks/keep-build-tree.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash prePhases+=" moveBuildDir" moveBuildDir() { diff --git a/pkgs/build-support/setup-hooks/ld-is-cc-hook.sh b/pkgs/build-support/setup-hooks/ld-is-cc-hook.sh index b53e184b09561..761d0c8622e38 100644 --- a/pkgs/build-support/setup-hooks/ld-is-cc-hook.sh +++ b/pkgs/build-support/setup-hooks/ld-is-cc-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash ld-is-cc-hook() { LD=$CC } diff --git a/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh b/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh index 9108b4c50355c..4c7e011770f59 100644 --- a/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh +++ b/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash postPhases+=" coverageReportPhase" coverageReportPhase() { diff --git a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh index 0608d3ca81c4e..fd65f2e8e13b6 100644 --- a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh +++ b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash fixupOutputHooks+=(_makeSymlinksRelative) # For every symlink in $output that refers to another file in $output diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index 8b7012677cd58..f109771f256c0 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Assert that FILE exists and is executable # # assertExecutable FILE diff --git a/pkgs/build-support/setup-hooks/move-docs.sh b/pkgs/build-support/setup-hooks/move-docs.sh index e4460f98816da..3b8850cea66fa 100644 --- a/pkgs/build-support/setup-hooks/move-docs.sh +++ b/pkgs/build-support/setup-hooks/move-docs.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # This setup hook moves $out/{man,doc,info} to $out/share; moves # $out/share/man to $man/share/man; and moves $out/share/doc to # $man/share/doc. @@ -20,4 +21,3 @@ _moveToShare() { fi done } - diff --git a/pkgs/build-support/setup-hooks/move-lib64.sh b/pkgs/build-support/setup-hooks/move-lib64.sh index 9517af797323d..6d94fcad38004 100644 --- a/pkgs/build-support/setup-hooks/move-lib64.sh +++ b/pkgs/build-support/setup-hooks/move-lib64.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # This setup hook, for each output, moves everything in $output/lib64 # to $output/lib, and replaces $output/lib64 with a symlink to # $output/lib. The rationale is that lib64 directories are unnecessary diff --git a/pkgs/build-support/setup-hooks/move-sbin.sh b/pkgs/build-support/setup-hooks/move-sbin.sh index 1c0c4dc9f2d98..8ca0b77344584 100644 --- a/pkgs/build-support/setup-hooks/move-sbin.sh +++ b/pkgs/build-support/setup-hooks/move-sbin.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # This setup hook, for each output, moves everything in $output/sbin # to $output/bin, and replaces $output/sbin with a symlink to # $output/bin. diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index bfa47e3b20e17..babcd7cdd6cdf 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # The base package for automatic multiple-output splitting. Used in stdenv as well. preConfigureHooks+=(_multioutConfig) preFixupHooks+=(_multioutDocs) diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index 04ebcd2cc64ec..98416974e16dc 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # This setup hook causes the fixup phase to rewrite all script # interpreter file names (`#! /path') to paths found in $PATH. E.g., # /bin/sh will be rewritten to /nix/store/-some-bash/bin/sh. diff --git a/pkgs/build-support/setup-hooks/prune-libtool-files.sh b/pkgs/build-support/setup-hooks/prune-libtool-files.sh index 0ec56549645c3..1907533e302ab 100644 --- a/pkgs/build-support/setup-hooks/prune-libtool-files.sh +++ b/pkgs/build-support/setup-hooks/prune-libtool-files.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Clear dependency_libs in libtool files for shared libraries. # Shared libraries already encode their dependencies with locations. .la diff --git a/pkgs/build-support/setup-hooks/reproducible-builds.sh b/pkgs/build-support/setup-hooks/reproducible-builds.sh index 7b52f84df67b4..19af8262e026d 100644 --- a/pkgs/build-support/setup-hooks/reproducible-builds.sh +++ b/pkgs/build-support/setup-hooks/reproducible-builds.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Use the last part of the out path as hash input for the build. # This should ensure that it is deterministic across rebuilds of the same # derivation and not easily collide with other builds. diff --git a/pkgs/build-support/setup-hooks/role.bash b/pkgs/build-support/setup-hooks/role.bash index b2d34a1f8606d..518504d22efce 100644 --- a/pkgs/build-support/setup-hooks/role.bash +++ b/pkgs/build-support/setup-hooks/role.bash @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Since the same derivation can be depend on in multiple ways, we need to # accumulate *each* role (i.e. host and target platforms relative the depending # derivation) in which the derivation is used. diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index 2481d8f50470c..0385b23422885 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash export NIX_SET_BUILD_ID=1 export NIX_LDFLAGS+=" --compress-debug-sections=zlib" export NIX_CFLAGS_COMPILE+=" -ggdb -Wa,--compress-debug-sections" diff --git a/pkgs/build-support/setup-hooks/set-java-classpath.sh b/pkgs/build-support/setup-hooks/set-java-classpath.sh index 445fa56d61dee..12beb53d1aabb 100644 --- a/pkgs/build-support/setup-hooks/set-java-classpath.sh +++ b/pkgs/build-support/setup-hooks/set-java-classpath.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # This setup hook adds every JAR in the share/java subdirectories of # the build inputs to $CLASSPATH. diff --git a/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh b/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh index ae34ffec48547..8581414d0dd18 100644 --- a/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh +++ b/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash updateSourceDateEpoch() { local path="$1" diff --git a/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh b/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh index 96bf48cf123ab..63354cc9a18d4 100644 --- a/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh +++ b/pkgs/build-support/setup-hooks/setup-debug-info-dirs.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash setupDebugInfoDirs () { addToSearchPath NIX_DEBUG_INFO_DIRS $1/lib/debug } diff --git a/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh b/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh index 825da1bde962c..7f7be72a3962f 100644 --- a/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh +++ b/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # This setup hook modifies a Perl script so that any "-I" flags in its shebang # line are rewritten into a "use lib ..." statement on the next line. This gets # around a limitation in Darwin, which will not properly handle a script whose diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh index 2d8e66a89fa33..5f2b980f2fa37 100644 --- a/pkgs/build-support/setup-hooks/strip.sh +++ b/pkgs/build-support/setup-hooks/strip.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # This setup hook strips libraries and executables in the fixup phase. fixupOutputHooks+=(_doStrip) diff --git a/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh b/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh index ebd3afa05d94b..38f2347295f46 100644 --- a/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh +++ b/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash preConfigurePhases+=" updateAutotoolsGnuConfigScriptsPhase" updateAutotoolsGnuConfigScriptsPhase() { diff --git a/pkgs/build-support/setup-hooks/use-old-cxx-abi.sh b/pkgs/build-support/setup-hooks/use-old-cxx-abi.sh index 53335d7a9a7ae..8956ef2788a07 100644 --- a/pkgs/build-support/setup-hooks/use-old-cxx-abi.sh +++ b/pkgs/build-support/setup-hooks/use-old-cxx-abi.sh @@ -1 +1,2 @@ +# shellcheck shell=bash export NIX_CFLAGS_COMPILE+=" -D_GLIBCXX_USE_CXX11_ABI=0" diff --git a/pkgs/build-support/setup-hooks/validate-pkg-config.sh b/pkgs/build-support/setup-hooks/validate-pkg-config.sh index c212a1f5301a2..2e486bfc41d02 100644 --- a/pkgs/build-support/setup-hooks/validate-pkg-config.sh +++ b/pkgs/build-support/setup-hooks/validate-pkg-config.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # This setup hook validates each pkgconfig file in each output. fixupOutputHooks+=(_validatePkgConfig) diff --git a/pkgs/build-support/setup-hooks/win-dll-link.sh b/pkgs/build-support/setup-hooks/win-dll-link.sh index 6130f32bef86c..5ca38b93d29f7 100644 --- a/pkgs/build-support/setup-hooks/win-dll-link.sh +++ b/pkgs/build-support/setup-hooks/win-dll-link.sh @@ -1,4 +1,4 @@ - +# shellcheck shell=bash fixupOutputHooks+=(_linkDLLs) # For every *.{exe,dll} in $output/bin/ we try to find all (potential) @@ -42,4 +42,3 @@ _linkDLLs() { echo "Created $linkCount DLL link(s) in $prefix/bin" ) } - From 18802e850286d693fa9b0141b7d8169ddd2a456a Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:37:55 +1300 Subject: [PATCH 004/360] jibri: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/jibri/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/jibri/update.sh b/pkgs/servers/jibri/update.sh index 9606a5170c1ad..e1472541af6e5 100755 --- a/pkgs/servers/jibri/update.sh +++ b/pkgs/servers/jibri/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl pup common-updater-scripts +# shellcheck shell=bash set -eu -o pipefail From 12a8b331169e0be67311e905b71b7321bd63aea9 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:40:45 +1300 Subject: [PATCH 005/360] scripts: Indicate shell to ShellCheck ShellCheck SC1008. --- maintainers/scripts/db-to-md.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/scripts/db-to-md.sh b/maintainers/scripts/db-to-md.sh index 01357d1e24120..f9651903998a3 100755 --- a/maintainers/scripts/db-to-md.sh +++ b/maintainers/scripts/db-to-md.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -I nixpkgs=. -i bash -p pandoc +# shellcheck shell=bash # This script is temporarily needed while we transition the manual to # CommonMark. It converts DocBook files into our CommonMark flavour. From 05f054c556e43c29977d74cbc90e362cdef5eb5e Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:43:04 +1300 Subject: [PATCH 006/360] hylafax: Indicate shell to ShellCheck ShellCheck SC1008. --- nixos/modules/services/networking/hylafax/faxq-wait.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/hylafax/faxq-wait.sh b/nixos/modules/services/networking/hylafax/faxq-wait.sh index 1826aa30e6275..128dc4029c813 100755 --- a/nixos/modules/services/networking/hylafax/faxq-wait.sh +++ b/nixos/modules/services/networking/hylafax/faxq-wait.sh @@ -1,4 +1,5 @@ #! @runtimeShell@ -e +# shellcheck shell=bash # skip this if there are no modems at all if ! stat -t "@spoolAreaPath@"/etc/config.* >/dev/null 2>&1 From 8d42adfd064ee632051dfc80696742eca1c5a2e1 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:43:22 +1300 Subject: [PATCH 007/360] blockchains: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/blockchains/bisq-desktop/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/blockchains/bisq-desktop/update.sh b/pkgs/applications/blockchains/bisq-desktop/update.sh index 393447834bba5..2b990b9bee773 100755 --- a/pkgs/applications/blockchains/bisq-desktop/update.sh +++ b/pkgs/applications/blockchains/bisq-desktop/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq gnused gnupg common-updater-scripts +# shellcheck shell=bash set -eu -o pipefail From 654b9c3b45c2ca49bb8e241f54d72637dd71ade3 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:43:29 +1300 Subject: [PATCH 008/360] nerdfonts: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/data/fonts/nerdfonts/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/fonts/nerdfonts/update.sh b/pkgs/data/fonts/nerdfonts/update.sh index b4c4aaa7cf2b7..9fe085d68a6da 100755 --- a/pkgs/data/fonts/nerdfonts/update.sh +++ b/pkgs/data/fonts/nerdfonts/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nix-prefetch jq +# shellcheck shell=bash latest_release=$(curl --silent https://api.github.com/repos/ryanoasis/nerd-fonts/releases/latest) version=$(jq -r '.tag_name' <<<"$latest_release") From e5fe29a47b7ede6eb4e8da4de350f9c9f7beddb8 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:43:35 +1300 Subject: [PATCH 009/360] ghc: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/compilers/ghc/gcc-clang-wrapper.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/ghc/gcc-clang-wrapper.sh b/pkgs/development/compilers/ghc/gcc-clang-wrapper.sh index 45af982c2973c..27621aa6472cd 100755 --- a/pkgs/development/compilers/ghc/gcc-clang-wrapper.sh +++ b/pkgs/development/compilers/ghc/gcc-clang-wrapper.sh @@ -1,4 +1,5 @@ #!@shell@ +# shellcheck shell=bash inPreprocessorMode () { hasE=0 From 2d46282bb5587d1640ad1eeda05a2dc915effc01 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:43:42 +1300 Subject: [PATCH 010/360] languagemachines: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/libraries/languagemachines/update | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/languagemachines/update b/pkgs/development/libraries/languagemachines/update index 3189637df7463..1f6c1dc527a97 100755 --- a/pkgs/development/libraries/languagemachines/update +++ b/pkgs/development/libraries/languagemachines/update @@ -3,6 +3,7 @@ #!nix-shell --packages jq #!nix-shell --packages parallel #!nix-shell -i bash +# shellcheck shell=bash # Exit immediately if a command exits with a non-zero status. # Exit when a producer fails in a pipe From 852e7601e70f0f4c1f221de6580fa21e89f38a62 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:43:53 +1300 Subject: [PATCH 011/360] jitsi-meet-prosody: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/misc/jitsi-meet-prosody/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/jitsi-meet-prosody/update.sh b/pkgs/misc/jitsi-meet-prosody/update.sh index bc039d1ba8e82..3c241608817df 100755 --- a/pkgs/misc/jitsi-meet-prosody/update.sh +++ b/pkgs/misc/jitsi-meet-prosody/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl pup common-updater-scripts +# shellcheck shell=bash set -eu -o pipefail From 505bf1d0a06cd0807bd29f2e2f14abb853f4779e Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:44:00 +1300 Subject: [PATCH 012/360] sonarr: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/sonarr/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/sonarr/update.sh b/pkgs/servers/sonarr/update.sh index faa4f65cfc8f7..3cf8d2439252e 100755 --- a/pkgs/servers/sonarr/update.sh +++ b/pkgs/servers/sonarr/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts +# shellcheck shell=bash latestTag=$(curl https://api.github.com/repos/Sonarr/Sonarr/tags | jq -r '.[] | .name' | sort --version-sort | tail -1) version="$(expr $latestTag : 'v\(.*\)')" From 3a26e6479e679c677471801fd55a4aa857beb7c2 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:44:05 +1300 Subject: [PATCH 013/360] vscode: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/editors/vscode/update-vscode.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vscode/update-vscode.sh b/pkgs/applications/editors/vscode/update-vscode.sh index 709fbe1c7517d..1a0ee11fb3b54 100755 --- a/pkgs/applications/editors/vscode/update-vscode.sh +++ b/pkgs/applications/editors/vscode/update-vscode.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq gnused +# shellcheck shell=bash # Update script for the vscode versions and hashes. # Usually doesn't need to be called by hand, From 26369cb6c5c0746bd4b561e010bf098d08e389c0 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:44:10 +1300 Subject: [PATCH 014/360] boot: Indicate shell to ShellCheck ShellCheck SC1008. --- nixos/modules/system/boot/stage-2-init.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index afaca2e4158d7..1851644224147 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -1,4 +1,5 @@ #! @shell@ +# shellcheck shell=bash systemConfig=@systemConfig@ From 06f353a94ebc763adaf6173903ad056b35c548fc Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:55:05 +1300 Subject: [PATCH 015/360] scripts: Indicate shell to ShellCheck ShellCheck SC1008. --- maintainers/scripts/check-maintainer-github-handles.sh | 1 + maintainers/scripts/fetch-kde-qt.sh | 1 + maintainers/scripts/nix-diff.sh | 1 + maintainers/scripts/update-redirected-urls.sh | 1 + maintainers/scripts/update-ruby-packages | 1 + 5 files changed, 5 insertions(+) diff --git a/maintainers/scripts/check-maintainer-github-handles.sh b/maintainers/scripts/check-maintainer-github-handles.sh index 879a2e452cb33..b22b08c9260f2 100755 --- a/maintainers/scripts/check-maintainer-github-handles.sh +++ b/maintainers/scripts/check-maintainer-github-handles.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p jq parallel +# shellcheck shell=bash # Example how to work with the `lib.maintainers` attrset. # Can be used to check whether all user handles are still valid. diff --git a/maintainers/scripts/fetch-kde-qt.sh b/maintainers/scripts/fetch-kde-qt.sh index 22d78151978b0..0bd761a840a4c 100755 --- a/maintainers/scripts/fetch-kde-qt.sh +++ b/maintainers/scripts/fetch-kde-qt.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils findutils gnused nix wget +# shellcheck shell=bash set -efuo pipefail diff --git a/maintainers/scripts/nix-diff.sh b/maintainers/scripts/nix-diff.sh index 0c65e29cf4351..4e2e0b36594dd 100755 --- a/maintainers/scripts/nix-diff.sh +++ b/maintainers/scripts/nix-diff.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p coreutils gnugrep gnused +# shellcheck shell=bash ################################################################################ # nix-diff.sh # diff --git a/maintainers/scripts/update-redirected-urls.sh b/maintainers/scripts/update-redirected-urls.sh index 5ffa9aca5f688..931a04da71907 100755 --- a/maintainers/scripts/update-redirected-urls.sh +++ b/maintainers/scripts/update-redirected-urls.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -p bash curl ripgrep jq -i bash +# shellcheck shell=bash set -euxo pipefail diff --git a/maintainers/scripts/update-ruby-packages b/maintainers/scripts/update-ruby-packages index 60da1a1b5938f..70e1fb020dcd8 100755 --- a/maintainers/scripts/update-ruby-packages +++ b/maintainers/scripts/update-ruby-packages @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p bundler bundix +# shellcheck shell=bash set -euf -o pipefail From 5a98b89ee9aeb7e74a45f99c7cd450b505bcd037 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:55:35 +1300 Subject: [PATCH 016/360] scripts/haskell: Indicate shell to ShellCheck ShellCheck SC1008. --- maintainers/scripts/haskell/mark-broken.sh | 1 + maintainers/scripts/haskell/merge-and-open-pr.sh | 1 + maintainers/scripts/haskell/regenerate-hackage-packages.sh | 1 + .../scripts/haskell/regenerate-transitive-broken-packages.sh | 1 + maintainers/scripts/haskell/update-cabal2nix-unstable.sh | 1 + maintainers/scripts/haskell/update-hackage.sh | 1 + maintainers/scripts/haskell/update-stackage.sh | 1 + .../scripts/haskell/upload-nixos-package-list-to-hackage.sh | 1 + 8 files changed, 8 insertions(+) diff --git a/maintainers/scripts/haskell/mark-broken.sh b/maintainers/scripts/haskell/mark-broken.sh index 97dd5be8aaa65..7ad2c803a8296 100755 --- a/maintainers/scripts/haskell/mark-broken.sh +++ b/maintainers/scripts/haskell/mark-broken.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils git -I nixpkgs=. +# shellcheck shell=bash # This script uses the data pulled with # maintainers/scripts/haskell/hydra-report.hs get-report to produce a list of diff --git a/maintainers/scripts/haskell/merge-and-open-pr.sh b/maintainers/scripts/haskell/merge-and-open-pr.sh index 18db1da0f2a5b..07ab9162a7e03 100755 --- a/maintainers/scripts/haskell/merge-and-open-pr.sh +++ b/maintainers/scripts/haskell/merge-and-open-pr.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p git gh -I nixpkgs=. +# shellcheck shell=bash # # Script to merge the currently open haskell-updates PR into master, bump the # Stackage version and Hackage versions, and open the next haskell-updates PR. diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh index 285f6ed7cf94c..17cc981b301b1 100755 --- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh +++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-unstable git nix -I nixpkgs=. +# shellcheck shell=bash # This script is used to regenerate nixpkgs' Haskell package set, using the # tool hackage2nix from the nixos/cabal2nix repo. hackage2nix looks at the diff --git a/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh b/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh index 94104e00edb81..dda55bfe6e002 100755 --- a/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh +++ b/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils nix gnused -I nixpkgs=. +# shellcheck shell=bash config_file=pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml diff --git a/maintainers/scripts/haskell/update-cabal2nix-unstable.sh b/maintainers/scripts/haskell/update-cabal2nix-unstable.sh index 4158370456024..abaf67436b069 100755 --- a/maintainers/scripts/haskell/update-cabal2nix-unstable.sh +++ b/maintainers/scripts/haskell/update-cabal2nix-unstable.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-unstable -I nixpkgs=. +# shellcheck shell=bash # Updates cabal2nix-unstable to the latest master of the nixos/cabal2nix repository. # See regenerate-hackage-packages.sh for details on the purpose of this script. diff --git a/maintainers/scripts/haskell/update-hackage.sh b/maintainers/scripts/haskell/update-hackage.sh index a7cfecbbb0fe8..a7b91afe1e293 100755 --- a/maintainers/scripts/haskell/update-hackage.sh +++ b/maintainers/scripts/haskell/update-hackage.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p nix curl jq nix-prefetch-github git gnused -I nixpkgs=. +# shellcheck shell=bash # See regenerate-hackage-packages.sh for details on the purpose of this script. diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index ecf38dc4b9001..b12d79a3bbfb6 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p nix curl jq nix-prefetch-github git gnused gnugrep -I nixpkgs=. +# shellcheck shell=bash set -eu -o pipefail diff --git a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh index 8c39d289f7aaa..93394560f144e 100755 --- a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh +++ b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p nix curl gnused -I nixpkgs=. +# shellcheck shell=bash # On Hackage every package description shows a category "Distributions" which # lists a "NixOS" version. From f0fae01d7a9beba0cc6b03f9a748863d491dd31f Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:55:43 +1300 Subject: [PATCH 017/360] manual: Indicate shell to ShellCheck ShellCheck SC1008. --- nixos/doc/manual/md-to-db.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/doc/manual/md-to-db.sh b/nixos/doc/manual/md-to-db.sh index e0274f5619c70..e940ce623ec19 100755 --- a/nixos/doc/manual/md-to-db.sh +++ b/nixos/doc/manual/md-to-db.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -I nixpkgs=channel:nixpkgs-unstable -i bash -p pandoc +# shellcheck shell=bash # This script is temporarily needed while we transition the manual to # CommonMark. It converts the .md files in the regular manual folder From 092c8af206d00466d920ffa9416ac118a547c3e1 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:55:52 +1300 Subject: [PATCH 018/360] gce: Indicate shell to ShellCheck ShellCheck SC1008. --- nixos/maintainers/scripts/gce/create-gce.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/maintainers/scripts/gce/create-gce.sh b/nixos/maintainers/scripts/gce/create-gce.sh index 0eec4d0411080..97740240e9d98 100755 --- a/nixos/maintainers/scripts/gce/create-gce.sh +++ b/nixos/maintainers/scripts/gce/create-gce.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p google-cloud-sdk +# shellcheck shell=bash set -euo pipefail From 9df890f3dcb031a12e008de05db262f365f19d5f Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:56:03 +1300 Subject: [PATCH 019/360] tools/nixos-build-vms: Indicate shell to ShellCheck ShellCheck SC1008. --- nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh index 2a6c3ab11497f..ed167b389d03c 100644 --- a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh +++ b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh @@ -1,4 +1,5 @@ #! @runtimeShell@ -e +# shellcheck shell=bash # Shows the usage of this command to the user From 2c50178f0a2285e0b296d07bef091217c22b610c Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:56:17 +1300 Subject: [PATCH 020/360] nixos/installer: Indicate shell to ShellCheck ShellCheck SC1008. --- nixos/modules/installer/tools/nixos-enter.sh | 1 + nixos/modules/installer/tools/nixos-install.sh | 1 + nixos/modules/installer/tools/nixos-version.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh index 00883205e8b5d..6469d9faa0386 100644 --- a/nixos/modules/installer/tools/nixos-enter.sh +++ b/nixos/modules/installer/tools/nixos-enter.sh @@ -1,4 +1,5 @@ #! @runtimeShell@ +# shellcheck shell=bash set -e diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 135ee1305f122..fc4a69aa17d34 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -1,4 +1,5 @@ #! @runtimeShell@ +# shellcheck shell=bash set -e shopt -s nullglob diff --git a/nixos/modules/installer/tools/nixos-version.sh b/nixos/modules/installer/tools/nixos-version.sh index f5e3f32b3c632..59a9c572b4184 100644 --- a/nixos/modules/installer/tools/nixos-version.sh +++ b/nixos/modules/installer/tools/nixos-version.sh @@ -1,4 +1,5 @@ #! @runtimeShell@ +# shellcheck shell=bash case "$1" in -h|--help) From bed2e6c179188de80d569c717009cae51b07a9d8 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:56:30 +1300 Subject: [PATCH 021/360] hylafax: Indicate shell to ShellCheck ShellCheck SC1008. --- nixos/modules/services/networking/hylafax/spool.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/hylafax/spool.sh b/nixos/modules/services/networking/hylafax/spool.sh index 8b723df77df9a..b0e14a7fc94ab 100755 --- a/nixos/modules/services/networking/hylafax/spool.sh +++ b/nixos/modules/services/networking/hylafax/spool.sh @@ -1,4 +1,5 @@ #! @runtimeShell@ -e +# shellcheck shell=bash # The following lines create/update the HylaFAX spool directory: # Subdirectories/files with persistent data are kept, From 19f8b3eea200e9fdf05e7b37b268c506ba88e64b Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:56:39 +1300 Subject: [PATCH 022/360] boot: Indicate shell to ShellCheck ShellCheck SC1008. --- nixos/modules/system/boot/stage-1-init.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 3dfcc010b64e8..9d1d3df304c49 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -1,4 +1,5 @@ #! @shell@ +# shellcheck shell=bash targetRoot=/mnt-root console=tty1 From 3bb81191ebf6f25f22236b5b5d789eba3a93e2a5 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:56:56 +1300 Subject: [PATCH 023/360] netease-cloud-music-gtk: Indicate shell to ShellCheck ShellCheck SC1008. --- .../audio/netease-cloud-music-gtk/update-cargo-lock.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/update-cargo-lock.sh b/pkgs/applications/audio/netease-cloud-music-gtk/update-cargo-lock.sh index 75b04d1e77ca8..c90df0c55b1f7 100755 --- a/pkgs/applications/audio/netease-cloud-music-gtk/update-cargo-lock.sh +++ b/pkgs/applications/audio/netease-cloud-music-gtk/update-cargo-lock.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p coreutils ripgrep git cargo +# shellcheck shell=bash # Ref: https://github.com/NixOS/nixpkgs/blob/nixos-21.05/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh From 29ee459a015b98349a85daec2db713211b94bf72 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 14:57:05 +1300 Subject: [PATCH 024/360] netease-music-tui: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh b/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh index b7ca4216ace5f..04fb5c068135b 100644 --- a/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh +++ b/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh @@ -1,5 +1,6 @@ #!nix-shell #!nix-shell -i bash -p coreutils gnugrep git cargo +# shellcheck shell=bash # This updates cargo-lock.patch for the netease-music-tui version listed in # default.nix. From 92f244489fde2e0e8d93a065c0580d5b4b703062 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:07:09 +1300 Subject: [PATCH 025/360] plexamp: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/audio/plexamp/update-plexamp.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/plexamp/update-plexamp.sh b/pkgs/applications/audio/plexamp/update-plexamp.sh index b6b8def1e310a..2431a3b266641 100755 --- a/pkgs/applications/audio/plexamp/update-plexamp.sh +++ b/pkgs/applications/audio/plexamp/update-plexamp.sh @@ -1,6 +1,7 @@ #! /usr/bin/env nix-shell #! nix-shell -p yq bash curl bc ripgrep #! nix-shell -i bash +# shellcheck shell=bash set -Eeuxo pipefail From 1361f5ccee5eaba9d698b9973579712e0bd5c7ec Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:07:16 +1300 Subject: [PATCH 026/360] spotify: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/audio/spotify/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/spotify/update.sh b/pkgs/applications/audio/spotify/update.sh index a8836214f2fc6..217ab8249e2e8 100755 --- a/pkgs/applications/audio/spotify/update.sh +++ b/pkgs/applications/audio/spotify/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p curl jq git gnused gnugrep +# shellcheck shell=bash # executing this script without arguments will From f6ac83e391bda75fe972ef2a5ca83f33b07cc95b Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:07:35 +1300 Subject: [PATCH 027/360] electrs: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/blockchains/electrs/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/blockchains/electrs/update.sh b/pkgs/applications/blockchains/electrs/update.sh index 14105d71a448a..b139690f8864e 100755 --- a/pkgs/applications/blockchains/electrs/update.sh +++ b/pkgs/applications/blockchains/electrs/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p coreutils curl jq git gnupg common-updater-scripts +# shellcheck shell=bash set -euo pipefail # Fetch latest release, GPG-verify the tag, update derivation From 84ffa825297b06735c0c23ebc3dd4d767fe74404 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:07:44 +1300 Subject: [PATCH 028/360] nbxplorer: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/blockchains/nbxplorer/util/create-deps.sh | 1 + pkgs/applications/blockchains/nbxplorer/util/update-common.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh index fb10446142e20..b957d0275a333 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p dotnet-sdk_3 +# shellcheck shell=bash set -euo pipefail # Writes deps for dotnet package in $pkgSrc to $depsFile. diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh index ed50762224052..d0f62920d3bcb 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_3 git gnupg nix +# shellcheck shell=bash set -euo pipefail # This script uses the following env vars: From aa65f7b3e2a2e77fd96c54d8886921d586d9e2bf Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:07:51 +1300 Subject: [PATCH 029/360] wasabibackend: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/blockchains/wasabibackend/create_deps.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/blockchains/wasabibackend/create_deps.sh b/pkgs/applications/blockchains/wasabibackend/create_deps.sh index 764bf2106ef9d..26875dca499fd 100755 --- a/pkgs/applications/blockchains/wasabibackend/create_deps.sh +++ b/pkgs/applications/blockchains/wasabibackend/create_deps.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p dotnet-sdk_3 jq xmlstarlet curl nixpkgs-fmt +# shellcheck shell=bash set -euo pipefail # Run this script to generate deps.nix From 612da7d730eca407108cf87eae9fcfb82deac421 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:07:59 +1300 Subject: [PATCH 030/360] emacs: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/editors/emacs/elisp-packages/update-elpa | 1 + .../editors/emacs/elisp-packages/update-from-overlay | 1 + pkgs/applications/editors/emacs/elisp-packages/update-nongnu | 1 + pkgs/applications/editors/emacs/elisp-packages/update-org | 1 + 4 files changed, 4 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-elpa b/pkgs/applications/editors/emacs/elisp-packages/update-elpa index ba2964b2ead09..68604b86a09ef 100755 --- a/pkgs/applications/editors/emacs/elisp-packages/update-elpa +++ b/pkgs/applications/editors/emacs/elisp-packages/update-elpa @@ -1,4 +1,5 @@ #! /usr/bin/env nix-shell #! nix-shell --show-trace ./emacs2nix.nix -i bash +# shellcheck shell=bash exec elpa-packages.sh --names $EMACS2NIX/names.nix -o elpa-generated.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay index 41cde07a211c9..a3d83543c2a89 100755 --- a/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay +++ b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p curl nix +# shellcheck shell=bash set -euxo pipefail export NIXPKGS_ALLOW_BROKEN=1 diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-nongnu b/pkgs/applications/editors/emacs/elisp-packages/update-nongnu index dc43a86efbe3d..d64c9e529dd5d 100755 --- a/pkgs/applications/editors/emacs/elisp-packages/update-nongnu +++ b/pkgs/applications/editors/emacs/elisp-packages/update-nongnu @@ -1,4 +1,5 @@ #! /usr/bin/env nix-shell #! nix-shell --show-trace ./emacs2nix.nix -i bash +# shellcheck shell=bash exec nongnu-packages.sh --names $EMACS2NIX/names.nix -o nongnu-generated.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-org b/pkgs/applications/editors/emacs/elisp-packages/update-org index 2119a1672287f..2972322f85ad1 100755 --- a/pkgs/applications/editors/emacs/elisp-packages/update-org +++ b/pkgs/applications/editors/emacs/elisp-packages/update-org @@ -1,4 +1,5 @@ #! /usr/bin/env nix-shell #! nix-shell --show-trace ./emacs2nix.nix -i bash +# shellcheck shell=bash exec org-packages.sh --names $EMACS2NIX/names.nix -o org-generated.nix From 5311e029235b89ba7a7cb2836ad4f20e18bbb464 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:08:05 +1300 Subject: [PATCH 031/360] vscode: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/editors/vscode/update-vscodium.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vscode/update-vscodium.sh b/pkgs/applications/editors/vscode/update-vscodium.sh index 79c6b497ecc68..b8ce31d8fbfbd 100755 --- a/pkgs/applications/editors/vscode/update-vscodium.sh +++ b/pkgs/applications/editors/vscode/update-vscodium.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused gawk +# shellcheck shell=bash # Update script for the vscode versions and hashes. # Usually doesn't need to be called by hand, From 939213640179baba0669190abdc1d14f044e3b1f Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:08:13 +1300 Subject: [PATCH 032/360] 1password-gui: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/misc/1password-gui/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/1password-gui/update.sh b/pkgs/applications/misc/1password-gui/update.sh index 8ebdaca711731..04198b9b530d4 100755 --- a/pkgs/applications/misc/1password-gui/update.sh +++ b/pkgs/applications/misc/1password-gui/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnused common-updater-scripts +# shellcheck shell=bash version="$(curl -sL https://onepassword.s3.amazonaws.com/linux/debian/dists/edge/main/binary-amd64/Packages | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)" update-source-version _1password-gui "$version" From ec2b7e9120da5838393266cb87f6acd6d4b8775f Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:08:19 +1300 Subject: [PATCH 033/360] logseq: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/misc/logseq/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/logseq/update.sh b/pkgs/applications/misc/logseq/update.sh index 9f83eefad1911..f4dfce75fb474 100755 --- a/pkgs/applications/misc/logseq/update.sh +++ b/pkgs/applications/misc/logseq/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts +# shellcheck shell=bash version="$(curl -sL "https://api.github.com/repos/logseq/logseq/releases" | jq '.[0].tag_name' --raw-output)" update-source-version logseq "$version" From 54b890c5652c8feb928c7709dd76c48c231b16d2 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:08:26 +1300 Subject: [PATCH 034/360] brave: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/networking/browsers/brave/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/brave/update.sh b/pkgs/applications/networking/browsers/brave/update.sh index b7d974ad259da..104b14f7a14cd 100755 --- a/pkgs/applications/networking/browsers/brave/update.sh +++ b/pkgs/applications/networking/browsers/brave/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnused common-updater-scripts +# shellcheck shell=bash version="$(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-amd64/Packages | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)" update-source-version brave "$version" From bcafe8a7ff3cbc8aff7999ea66b4c56e86088469 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:08:34 +1300 Subject: [PATCH 035/360] vivaldi: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/networking/browsers/vivaldi/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/vivaldi/update.sh b/pkgs/applications/networking/browsers/vivaldi/update.sh index 2e6c2853eb142..86f39e8e27c55 100755 --- a/pkgs/applications/networking/browsers/vivaldi/update.sh +++ b/pkgs/applications/networking/browsers/vivaldi/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p libarchive curl common-updater-scripts +# shellcheck shell=bash set -eu -o pipefail From 6b9b97d114178e71dc7bd1c93731d6210c98f495 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:08:39 +1300 Subject: [PATCH 036/360] nym: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/networking/nym/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/nym/update.sh b/pkgs/applications/networking/nym/update.sh index 0c65521c7f807..924dbd46f936a 100755 --- a/pkgs/applications/networking/nym/update.sh +++ b/pkgs/applications/networking/nym/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq nix-prefetch +# shellcheck shell=bash # adapted from rust-analyzer From 5edf3fdaad8ba0dba9026285faf1ffc2e61b0bb5 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:08:48 +1300 Subject: [PATCH 037/360] fluxcd: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/networking/cluster/fluxcd/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/update.sh b/pkgs/applications/networking/cluster/fluxcd/update.sh index 1ded63d4d86c1..fd327d2c9428e 100755 --- a/pkgs/applications/networking/cluster/fluxcd/update.sh +++ b/pkgs/applications/networking/cluster/fluxcd/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused jq +# shellcheck shell=bash set -x -eu -o pipefail @@ -35,4 +36,3 @@ else echo "Update failed. VENDOR_SHA256 is empty." exit 1 fi - From 5265c9c8f190306bcd4bded07e54cd115cfd7b95 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:08:54 +1300 Subject: [PATCH 038/360] linkerd: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/networking/cluster/linkerd/update-stable.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/cluster/linkerd/update-stable.sh b/pkgs/applications/networking/cluster/linkerd/update-stable.sh index 5ec96af796c0b..603e455905b1d 100755 --- a/pkgs/applications/networking/cluster/linkerd/update-stable.sh +++ b/pkgs/applications/networking/cluster/linkerd/update-stable.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused jq +# shellcheck shell=bash set -x -eu -o pipefail From a36e8b1a72251b8901645c559d025976050d729c Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:09:01 +1300 Subject: [PATCH 039/360] nixops: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/networking/cluster/nixops/update | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/cluster/nixops/update b/pkgs/applications/networking/cluster/nixops/update index 1d1fd93fdbeaa..9b40ef0da347f 100755 --- a/pkgs/applications/networking/cluster/nixops/update +++ b/pkgs/applications/networking/cluster/nixops/update @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -I nixpkgs=../../../../../. -i bash +# shellcheck shell=bash set -eux rm -f ./poetry.lock ./poetry-git-overlay.nix From 4e465645c4679be633df3b635a8270cc5ea1bf22 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:09:08 +1300 Subject: [PATCH 040/360] octant: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/networking/cluster/octant/update-desktop.sh | 1 + pkgs/applications/networking/cluster/octant/update.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/applications/networking/cluster/octant/update-desktop.sh b/pkgs/applications/networking/cluster/octant/update-desktop.sh index 4450834b4b70a..f550be242b8f9 100755 --- a/pkgs/applications/networking/cluster/octant/update-desktop.sh +++ b/pkgs/applications/networking/cluster/octant/update-desktop.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnused gawk nix-prefetch +# shellcheck shell=bash set -euo pipefail diff --git a/pkgs/applications/networking/cluster/octant/update.sh b/pkgs/applications/networking/cluster/octant/update.sh index 3e2b56b7a6198..9f9592567ecb0 100755 --- a/pkgs/applications/networking/cluster/octant/update.sh +++ b/pkgs/applications/networking/cluster/octant/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnused gawk nix-prefetch +# shellcheck shell=bash set -euo pipefail From 73036174ddf46b061c96c5d031dc7f1ea7f349a8 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:09:14 +1300 Subject: [PATCH 041/360] spacegun: Indicate shell to ShellCheck ShellCheck SC1008. --- .../networking/cluster/spacegun/generate-dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh b/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh index bda3d1727c4f3..38aa85b7f7183 100644 --- a/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh +++ b/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix +# shellcheck shell=bash # Download package.json and package-lock.json from the v0.3.3 release curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db4a1e387ef3ca01a1/package.json -o package.json From 7bd9f589b415669b13d2e71ab510a90c25830af8 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:09:22 +1300 Subject: [PATCH 042/360] bluejeans: Indicate shell to ShellCheck ShellCheck SC1008. --- .../networking/instant-messengers/bluejeans/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/update.sh b/pkgs/applications/networking/instant-messengers/bluejeans/update.sh index 3bb7d309e8755..ed4db6dcbfb52 100755 --- a/pkgs/applications/networking/instant-messengers/bluejeans/update.sh +++ b/pkgs/applications/networking/instant-messengers/bluejeans/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl pup common-updater-scripts +# shellcheck shell=bash set -eu -o pipefail From a4785bcd57a7d5c978e246bb54d5ca2f82f658a7 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:09:32 +1300 Subject: [PATCH 043/360] deltachat-desktop: Indicate shell to ShellCheck ShellCheck SC1008. --- .../networking/instant-messengers/deltachat-desktop/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh index dbe249d56dae6..8bf7d70622eb3 100755 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils curl gnused jq moreutils nix-prefetch +# shellcheck shell=bash set -euo pipefail cd "$(dirname "$0")" From b72f4d91380446de0bc15dccbd6695759473ccf7 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:09:37 +1300 Subject: [PATCH 044/360] keytar: Indicate shell to ShellCheck ShellCheck SC1008. --- .../networking/instant-messengers/element/keytar/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/update.sh b/pkgs/applications/networking/instant-messengers/element/keytar/update.sh index 8ac65ea45d3eb..41144098ba073 100755 --- a/pkgs/applications/networking/instant-messengers/element/keytar/update.sh +++ b/pkgs/applications/networking/instant-messengers/element/keytar/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-yarn-deps yarn +# shellcheck shell=bash if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then echo "Regenerates packaging data for the seshat package." From a42bf520e1e0449e4444d10aff86ee3a873b754b Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:09:43 +1300 Subject: [PATCH 045/360] seshat: Indicate shell to ShellCheck ShellCheck SC1008. --- .../networking/instant-messengers/element/seshat/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/update.sh b/pkgs/applications/networking/instant-messengers/element/seshat/update.sh index 1315715ac049f..4a7e41504eee5 100755 --- a/pkgs/applications/networking/instant-messengers/element/seshat/update.sh +++ b/pkgs/applications/networking/instant-messengers/element/seshat/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-yarn-deps yarn nix-prefetch +# shellcheck shell=bash if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then echo "Regenerates packaging data for the seshat package." @@ -46,4 +47,3 @@ cat > pin.json << EOF "cargoHash": "$cargo_hash" } EOF - From c471e2921eefc5f8493da1101a9710a9816f3473 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:09:47 +1300 Subject: [PATCH 046/360] element: Indicate shell to ShellCheck ShellCheck SC1008. --- .../applications/networking/instant-messengers/element/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/element/update.sh b/pkgs/applications/networking/instant-messengers/element/update.sh index 364f63a18bb61..4afc77cfa6a3a 100755 --- a/pkgs/applications/networking/instant-messengers/element/update.sh +++ b/pkgs/applications/networking/instant-messengers/element/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github +# shellcheck shell=bash if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then echo "Regenerates packaging data for the element packages." From abf6808c73e63b7b4091aa2cf70c8c3d4b735a5c Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:09:52 +1300 Subject: [PATCH 047/360] jami: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/networking/instant-messengers/jami/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/jami/update.sh b/pkgs/applications/networking/instant-messengers/jami/update.sh index 10d9bb885c35d..4a8aeee90ed68 100755 --- a/pkgs/applications/networking/instant-messengers/jami/update.sh +++ b/pkgs/applications/networking/instant-messengers/jami/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p coreutils curl gnused common-updater-scripts nix-prefetch +# shellcheck shell=bash set -e From 612985e89fffa9d189163f92a96c81fd07dae96a Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:09:59 +1300 Subject: [PATCH 048/360] schildichat: Indicate shell to ShellCheck ShellCheck SC1008. --- .../networking/instant-messengers/schildichat/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/schildichat/update.sh b/pkgs/applications/networking/instant-messengers/schildichat/update.sh index 3f5289de8c4ed..78ad4eb3e9555 100755 --- a/pkgs/applications/networking/instant-messengers/schildichat/update.sh +++ b/pkgs/applications/networking/instant-messengers/schildichat/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-git jq +# shellcheck shell=bash if [[ "$#" -gt 1 || "$1" == -* ]]; then echo "Regenerates packaging data for the SchildiChat packages." From 35f6c5c20ae11bbf99d6178e7fd03c8b55818fe5 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:10:04 +1300 Subject: [PATCH 049/360] slack: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/networking/instant-messengers/slack/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/slack/update.sh b/pkgs/applications/networking/instant-messengers/slack/update.sh index 0bb0d784167c1..83c7cd6e74149 100755 --- a/pkgs/applications/networking/instant-messengers/slack/update.sh +++ b/pkgs/applications/networking/instant-messengers/slack/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p curl gnused +# shellcheck shell=bash set -eou pipefail From eb4c62ed4e537239ecdad6932c72bd3a44e36494 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:10:10 +1300 Subject: [PATCH 050/360] zoom-us: Indicate shell to ShellCheck ShellCheck SC1008. --- .../applications/networking/instant-messengers/zoom-us/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh index 3ec1cccd0d64a..338ce922df6f1 100755 --- a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh +++ b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl pup common-updater-scripts +# shellcheck shell=bash set -eu -o pipefail From 1318b39893c3737ca88ad0028e0b858c2b8ba80d Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:10:19 +1300 Subject: [PATCH 051/360] n8n: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/networking/n8n/generate-dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/n8n/generate-dependencies.sh b/pkgs/applications/networking/n8n/generate-dependencies.sh index 2928116691840..073d38b3c4d6f 100755 --- a/pkgs/applications/networking/n8n/generate-dependencies.sh +++ b/pkgs/applications/networking/n8n/generate-dependencies.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix +# shellcheck shell=bash node2nix \ --node-env node-env.nix \ From 1d31ca87452c4341023a22bf75e6e90302b6ed02 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:10:26 +1300 Subject: [PATCH 052/360] powerdns-admin: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/networking/powerdns-admin/update-asset-deps.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/powerdns-admin/update-asset-deps.sh b/pkgs/applications/networking/powerdns-admin/update-asset-deps.sh index 86dcb8cbf6598..95ac7bcd20158 100755 --- a/pkgs/applications/networking/powerdns-admin/update-asset-deps.sh +++ b/pkgs/applications/networking/powerdns-admin/update-asset-deps.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=../../../.. -i bash -p wget yarn2nix-moretea.yarn2nix jq +# shellcheck shell=bash # This script is based upon: # pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh From e9714e266c494251dac437beb95e74626c86bdb5 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:10:34 +1300 Subject: [PATCH 053/360] vmware-horizon-client: Indicate shell to ShellCheck ShellCheck SC1008. --- .../networking/remote/vmware-horizon-client/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/update.sh b/pkgs/applications/networking/remote/vmware-horizon-client/update.sh index eec3d1de79e0e..b38f341f1d69c 100755 --- a/pkgs/applications/networking/remote/vmware-horizon-client/update.sh +++ b/pkgs/applications/networking/remote/vmware-horizon-client/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -p curl -p jq -p common-updater-scripts -i bash +# shellcheck shell=bash set -e entryPointURL='https://customerconnect.vmware.com/channel/public/api/v1.0/products/getRelatedDLGList?locale=en_US&category=desktop_end_user_computing&product=vmware_horizon_clients&version=horizon_8&dlgType=PRODUCT_BINARY' From 4e162dc0196684c6286f7fac9152abacaa9a3d9f Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:10:43 +1300 Subject: [PATCH 054/360] onlyoffice-bin: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/office/onlyoffice-bin/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/office/onlyoffice-bin/update.sh b/pkgs/applications/office/onlyoffice-bin/update.sh index d7b0bc106fa2d..379e0e9cccfaa 100644 --- a/pkgs/applications/office/onlyoffice-bin/update.sh +++ b/pkgs/applications/office/onlyoffice-bin/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts +# shellcheck shell=bash version="$(curl -sL "https://api.github.com/repos/ONLYOFFICE/DesktopEditors/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')" update-source-version onlyoffice-bin "$version" From d5ae48e80c04079f90ee10bb71e647b622841766 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:11:00 +1300 Subject: [PATCH 055/360] kicad: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/science/electronics/kicad/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/electronics/kicad/update.sh b/pkgs/applications/science/electronics/kicad/update.sh index 099440956ae73..fd8cbcd321aa6 100755 --- a/pkgs/applications/science/electronics/kicad/update.sh +++ b/pkgs/applications/science/electronics/kicad/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p coreutils git nix curl +# shellcheck shell=bash set -e From 69afa3fd94b07cf66eea6b696b6779b5f95c4678 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:11:07 +1300 Subject: [PATCH 056/360] omlibrary: Indicate shell to ShellCheck ShellCheck SC1008. --- .../science/misc/openmodelica/omlibrary/update-src-libs.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/update-src-libs.sh b/pkgs/applications/science/misc/openmodelica/omlibrary/update-src-libs.sh index b8f2e95923b54..30ff2de135f42 100755 --- a/pkgs/applications/science/misc/openmodelica/omlibrary/update-src-libs.sh +++ b/pkgs/applications/science/misc/openmodelica/omlibrary/update-src-libs.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p bash +# shellcheck shell=bash CWD=$PWD From ff33d2d0adf11cfce98b0a6d23084ad54ea4548a Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:11:16 +1300 Subject: [PATCH 057/360] commtiizen: Indicate shell to ShellCheck ShellCheck SC1008. --- .../version-management/commitizen/generate-dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/commitizen/generate-dependencies.sh b/pkgs/applications/version-management/commitizen/generate-dependencies.sh index 9855e2d41d1ad..ed44a4d1ea6a1 100755 --- a/pkgs/applications/version-management/commitizen/generate-dependencies.sh +++ b/pkgs/applications/version-management/commitizen/generate-dependencies.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -I nixpkgs=../../../.. -i bash -p nodePackages.node2nix +# shellcheck shell=bash node2nix \ --node-env node-env.nix \ From 14d4dc6d9a48fe47eaa27b92d534d06497e3b60d Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:11:23 +1300 Subject: [PATCH 058/360] git-and-tools: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/version-management/git-and-tools/git/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/git-and-tools/git/update.sh b/pkgs/applications/version-management/git-and-tools/git/update.sh index 54574722b02b7..03059b13cdb98 100755 --- a/pkgs/applications/version-management/git-and-tools/git/update.sh +++ b/pkgs/applications/version-management/git-and-tools/git/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl common-updater-scripts jq git +# shellcheck shell=bash set -eu -o pipefail From bd1475619639322453f98293f80f74b3402339dd Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:11:28 +1300 Subject: [PATCH 059/360] sourcehut: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/version-management/sourcehut/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/sourcehut/update.sh b/pkgs/applications/version-management/sourcehut/update.sh index 156d4cc35e448..aefbf587d1b4d 100755 --- a/pkgs/applications/version-management/sourcehut/update.sh +++ b/pkgs/applications/version-management/sourcehut/update.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p git mercurial common-updater-scripts +# shellcheck shell=bash cd "$(dirname "${BASH_SOURCE[0]}")" root=../../../.. From 819fe3ad395b831e6fa16eec1429fb8c76f49bd3 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:11:34 +1300 Subject: [PATCH 060/360] plex-media-player: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/video/plex-media-player/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/plex-media-player/update.sh b/pkgs/applications/video/plex-media-player/update.sh index a8493a16c9897..5a05ccc8defff 100755 --- a/pkgs/applications/video/plex-media-player/update.sh +++ b/pkgs/applications/video/plex-media-player/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl common-updater-scripts nix-prefetch-scripts jq +# shellcheck shell=bash set -xeuo pipefail From 45aabbe31d6a0b1c07fa4e0193aa99eea9e8c352 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:11:38 +1300 Subject: [PATCH 061/360] virtualbox: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/virtualization/virtualbox/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/virtualbox/update.sh b/pkgs/applications/virtualization/virtualbox/update.sh index fcd02ae8a27b6..c28100e4dafaa 100755 --- a/pkgs/applications/virtualization/virtualbox/update.sh +++ b/pkgs/applications/virtualization/virtualbox/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl common-updater-scripts nix-prefetch-scripts jq +# shellcheck shell=bash set -xeuo pipefail From 6aa70643e7c57cda480aff464e986d18b07e1d0a Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:11:47 +1300 Subject: [PATCH 062/360] bintools-wrapper: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/build-support/bintools-wrapper/ld-solaris-wrapper.sh | 1 + pkgs/build-support/bintools-wrapper/ld-wrapper.sh | 1 + .../bintools-wrapper/macos-sierra-reexport-hack.bash | 1 + 3 files changed, 3 insertions(+) diff --git a/pkgs/build-support/bintools-wrapper/ld-solaris-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-solaris-wrapper.sh index 5d81e34a047f9..a31120f72073a 100644 --- a/pkgs/build-support/bintools-wrapper/ld-solaris-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-solaris-wrapper.sh @@ -1,4 +1,5 @@ #!@shell@ +# shellcheck shell=bash set -eu -o pipefail shopt -s nullglob diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index 2f96480f80c1c..d17b2829522e7 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -1,4 +1,5 @@ #! @shell@ +# shellcheck shell=bash set -eu -o pipefail +o posix shopt -s nullglob diff --git a/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash b/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash index 71b9471cbc83f..07a8b16227242 100644 --- a/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash +++ b/pkgs/build-support/bintools-wrapper/macos-sierra-reexport-hack.bash @@ -1,4 +1,5 @@ #! @shell@ +# shellcheck shell=bash set -eu -o pipefail From 9a2f24961f630467a2dc096d251fff1aacff01f2 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:11:51 +1300 Subject: [PATCH 063/360] cc-wrapper: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 1 + pkgs/build-support/cc-wrapper/gnat-wrapper.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index aa25de336418d..84cf91e9efb91 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -1,4 +1,5 @@ #! @shell@ +# shellcheck shell=bash set -eu -o pipefail +o posix shopt -s nullglob diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh index 5714b228c595c..7e826155a8d53 100644 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -1,4 +1,5 @@ #! @shell@ +# shellcheck shell=bash set -eu -o pipefail +o posix shopt -s nullglob From bf8af947ef6d5246baa19ab2a0afc8492aef7cc4 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:11:57 +1300 Subject: [PATCH 064/360] emacs: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/build-support/emacs/wrapper.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/emacs/wrapper.sh b/pkgs/build-support/emacs/wrapper.sh index e8eecb8c86966..1b10ac8767fc1 100644 --- a/pkgs/build-support/emacs/wrapper.sh +++ b/pkgs/build-support/emacs/wrapper.sh @@ -1,4 +1,5 @@ #!@bash@ +# shellcheck shell=bash IFS=: From 616cefa1f7df1433afeabb5d3b6d3647ba5bee17 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:12:02 +1300 Subject: [PATCH 065/360] nuke-references: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/build-support/nuke-references/nuke-refs.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/nuke-references/nuke-refs.sh b/pkgs/build-support/nuke-references/nuke-refs.sh index 21eb855cbad9a..2de6a70cebb3d 100644 --- a/pkgs/build-support/nuke-references/nuke-refs.sh +++ b/pkgs/build-support/nuke-references/nuke-refs.sh @@ -1,4 +1,5 @@ #! @shell@ +# shellcheck shell=bash fixupHooks=() From ff9f21c87eed333ec4df8273474e42c90169cf94 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:12:07 +1300 Subject: [PATCH 066/360] pkg-config-wrapper: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh b/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh index a5a4427166889..24b4b720ce8bf 100644 --- a/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh +++ b/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh @@ -1,4 +1,5 @@ #! @shell@ +# shellcheck shell=bash set -eu -o pipefail +o posix shopt -s nullglob From 30ebbeb2b2b5f3eecc691f3a7e2cd3c11ef63222 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:12:13 +1300 Subject: [PATCH 067/360] remove-references-to: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/build-support/remove-references-to/remove-references-to.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/remove-references-to/remove-references-to.sh b/pkgs/build-support/remove-references-to/remove-references-to.sh index d8d38dbd80a90..227bc8f06e766 100644 --- a/pkgs/build-support/remove-references-to/remove-references-to.sh +++ b/pkgs/build-support/remove-references-to/remove-references-to.sh @@ -1,4 +1,5 @@ #! @shell@ -e +# shellcheck shell=bash fixupHooks=() From 869459ecefe780ed0ed90c9618aced1620924558 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:12:18 +1300 Subject: [PATCH 068/360] build-rust-package: Indicate shell to ShellCheck ShellCheck SC1008. --- .../rust/build-rust-package/sysroot/update-lockfile.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-package/sysroot/update-lockfile.sh b/pkgs/build-support/rust/build-rust-package/sysroot/update-lockfile.sh index 83d29832384fb..b352f309521bc 100755 --- a/pkgs/build-support/rust/build-rust-package/sysroot/update-lockfile.sh +++ b/pkgs/build-support/rust/build-rust-package/sysroot/update-lockfile.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p python3 python3.pkgs.toml cargo +# shellcheck shell=bash set -e @@ -17,5 +18,3 @@ RUSTC_BOOTSTRAP=1 cargo build || echo "Build failure is expected. All that's nee cp Cargo.lock "$HERE" rm -rf "$tempdir" - - From 086a66f4789f27a2e659c1636be9e970ce436be0 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:12:23 +1300 Subject: [PATCH 069/360] iosevka: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/data/fonts/iosevka/update-bin.sh | 1 + pkgs/data/fonts/iosevka/update-default.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/data/fonts/iosevka/update-bin.sh b/pkgs/data/fonts/iosevka/update-bin.sh index 68f93f1f26e69..80be6de202ec2 100755 --- a/pkgs/data/fonts/iosevka/update-bin.sh +++ b/pkgs/data/fonts/iosevka/update-bin.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p curl jq +# shellcheck shell=bash set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" diff --git a/pkgs/data/fonts/iosevka/update-default.sh b/pkgs/data/fonts/iosevka/update-default.sh index 208ea6101ac28..24c8ebf835449 100755 --- a/pkgs/data/fonts/iosevka/update-default.sh +++ b/pkgs/data/fonts/iosevka/update-default.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p common-updater-scripts coreutils gawk replace +# shellcheck shell=bash set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" From cf3e4e1b60d5a3cdb29bc3560c5bf15661ce65af Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:12:26 +1300 Subject: [PATCH 070/360] cacert: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/data/misc/cacert/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/misc/cacert/update.sh b/pkgs/data/misc/cacert/update.sh index 72d581b9650fa..f3bdcaaf03b74 100755 --- a/pkgs/data/misc/cacert/update.sh +++ b/pkgs/data/misc/cacert/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix common-updater-scripts jq +# shellcheck shell=bash # Build both the cacert package and an overriden version where we use the source attribute of NSS. # Cacert and NSS are both from the same upstream sources. They are decoupled as From 52549c370d9005f808c107cb79fa027839e46370 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:12:30 +1300 Subject: [PATCH 071/360] dns-root-data: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/data/misc/dns-root-data/update-root-key.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/misc/dns-root-data/update-root-key.sh b/pkgs/data/misc/dns-root-data/update-root-key.sh index 9a3141aef1973..ae0547e6db940 100755 --- a/pkgs/data/misc/dns-root-data/update-root-key.sh +++ b/pkgs/data/misc/dns-root-data/update-root-key.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p busybox unbound +# shellcheck shell=bash TMP=`mktemp` unbound-anchor -a "$TMP" From 2bb5e9f025a670b597b3667c14c5d21a7a2d8953 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:12:33 +1300 Subject: [PATCH 072/360] rime-data: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/data/misc/rime-data/generateFetchSchema.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/misc/rime-data/generateFetchSchema.sh b/pkgs/data/misc/rime-data/generateFetchSchema.sh index e7c05c4102819..c5565365f1f0b 100755 --- a/pkgs/data/misc/rime-data/generateFetchSchema.sh +++ b/pkgs/data/misc/rime-data/generateFetchSchema.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix-prefetch-git -p jq +# shellcheck shell=bash imlist=( array From 4629f7d814422f0cf8b5cbd8349f406530c19d26 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:12:41 +1300 Subject: [PATCH 073/360] elixir-ls: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/beam-modules/elixir-ls/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/beam-modules/elixir-ls/update.sh b/pkgs/development/beam-modules/elixir-ls/update.sh index 8bc1c2b6e9668..a9a97b5218ef0 100755 --- a/pkgs/development/beam-modules/elixir-ls/update.sh +++ b/pkgs/development/beam-modules/elixir-ls/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep +# shellcheck shell=bash # TODO set to `verbose` or `extdebug` once implemented in oil shopt --set xtrace From ccd305dad7920c9217d661ac7f86278dadd74c56 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:12:44 +1300 Subject: [PATCH 074/360] elm: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/compilers/elm/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/elm/update.sh b/pkgs/development/compilers/elm/update.sh index c2500b462adf5..79405b44fba6a 100755 --- a/pkgs/development/compilers/elm/update.sh +++ b/pkgs/development/compilers/elm/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -p cabal2nix elm2nix -i bash ../../.. +# shellcheck shell=bash cabal2nix https://github.com/elm/compiler --revision c9aefb6230f5e0bda03205ab0499f6e4af924495 > packages/elm.nix echo "need to manually copy registry.dat from an existing elm project" From 3d6108f361a34645640524887f96039b962f0532 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:12:47 +1300 Subject: [PATCH 075/360] gcc: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/compilers/gcc/update-mcfgthread-patches.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/gcc/update-mcfgthread-patches.sh b/pkgs/development/compilers/gcc/update-mcfgthread-patches.sh index c4fd79b26c342..6f16bf82bba88 100755 --- a/pkgs/development/compilers/gcc/update-mcfgthread-patches.sh +++ b/pkgs/development/compilers/gcc/update-mcfgthread-patches.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p curl +# shellcheck shell=bash # We use this script to download local copies instead of using # fetchpatch because lmhouse/MINGW-packages-dev is constantly rebased From 0eec922c0518dd8d7ad1c1e223afb47a93c65df3 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:12:53 +1300 Subject: [PATCH 076/360] graalvm: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/compilers/graalvm/community-edition/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/graalvm/community-edition/update.sh b/pkgs/development/compilers/graalvm/community-edition/update.sh index c821c83a59c82..31a84b7d63dd2 100755 --- a/pkgs/development/compilers/graalvm/community-edition/update.sh +++ b/pkgs/development/compilers/graalvm/community-edition/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -p coreutils curl nix jq gnused -i bash +# shellcheck shell=bash set -eou pipefail From b9be395fd79ff190ce0ed5a5cddc9b994c1b7fa0 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:12:56 +1300 Subject: [PATCH 077/360] purescript: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/compilers/purescript/purescript/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/purescript/purescript/update.sh b/pkgs/development/compilers/purescript/purescript/update.sh index ea6663d810c45..b24c70c044d37 100755 --- a/pkgs/development/compilers/purescript/purescript/update.sh +++ b/pkgs/development/compilers/purescript/purescript/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnused jq -I nixpkgs=. +# shellcheck shell=bash # # This script will update the purescript derivation to the latest version. From fe1f846b1cfee44d3ea33931090108f9d5708f05 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:12:59 +1300 Subject: [PATCH 078/360] roslyn: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/compilers/roslyn/create-deps.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/roslyn/create-deps.sh b/pkgs/development/compilers/roslyn/create-deps.sh index 5bdc37956b523..edf9ee0c7160b 100755 --- a/pkgs/development/compilers/roslyn/create-deps.sh +++ b/pkgs/development/compilers/roslyn/create-deps.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p dotnet-sdk_5 -p jq -p xmlstarlet -p curl +# shellcheck shell=bash set -euo pipefail cat << EOL From 7ef39c86cb9b595b456701b7af84d3ad08a6c5ed Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:13:05 +1300 Subject: [PATCH 079/360] python-language-server: Indicate shell to ShellCheck ShellCheck SC1008. --- .../dotnet-modules/python-language-server/create_deps.sh | 1 + .../dotnet-modules/python-language-server/format-deps.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/dotnet-modules/python-language-server/create_deps.sh b/pkgs/development/dotnet-modules/python-language-server/create_deps.sh index 37f0585d1fef2..8537ee425698d 100755 --- a/pkgs/development/dotnet-modules/python-language-server/create_deps.sh +++ b/pkgs/development/dotnet-modules/python-language-server/create_deps.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -p python3 dotnet-sdk_3 -i bash +# shellcheck shell=bash # Run this script to generate deps.nix # ./create_deps.sh /path/to/microsoft/python/language/server/source/checkout diff --git a/pkgs/development/dotnet-modules/python-language-server/format-deps.sh b/pkgs/development/dotnet-modules/python-language-server/format-deps.sh index c2115edb18acf..30d0c5af03369 100755 --- a/pkgs/development/dotnet-modules/python-language-server/format-deps.sh +++ b/pkgs/development/dotnet-modules/python-language-server/format-deps.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -p gawk nix -i bash +# shellcheck shell=bash # Retrieve sha256 hashes for each dependency in and format fetchNuGet calls echo "" > deps.nix From ef7e55d81c46c038640a69ebdafa94c797195d95 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:13:11 +1300 Subject: [PATCH 080/360] haskell-modules: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/haskell-modules/hoogle-local-wrapper.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/hoogle-local-wrapper.sh b/pkgs/development/haskell-modules/hoogle-local-wrapper.sh index 223d19b70f03a..e580a674d56da 100644 --- a/pkgs/development/haskell-modules/hoogle-local-wrapper.sh +++ b/pkgs/development/haskell-modules/hoogle-local-wrapper.sh @@ -1,4 +1,5 @@ #! @shell@ +# shellcheck shell=bash COMMAND=$1 shift From b5169fbe304273b4f30c7df890cca8355d996777 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:13:25 +1300 Subject: [PATCH 081/360] libhsts: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/libraries/libhsts/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libhsts/update.sh b/pkgs/development/libraries/libhsts/update.sh index f80966e08c9aa..d68c0d1ee7e64 100755 --- a/pkgs/development/libraries/libhsts/update.sh +++ b/pkgs/development/libraries/libhsts/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq +# shellcheck shell=bash set -euo pipefail -x From a43f5d8a6336db44474a6390fd3f1d773295bbea Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:13:29 +1300 Subject: [PATCH 082/360] nss: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/libraries/nss/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/nss/update.sh b/pkgs/development/libraries/nss/update.sh index 600dbdff004c7..50eaa718eeb90 100755 --- a/pkgs/development/libraries/nss/update.sh +++ b/pkgs/development/libraries/nss/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused coreutils common-updater-scripts +# shellcheck shell=bash set -x From 695332b43cf9dd423a5a24f953f46b57b9155274 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:13:50 +1300 Subject: [PATCH 083/360] qt-5: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/libraries/qt-5/5.15/fetch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/qt-5/5.15/fetch.sh b/pkgs/development/libraries/qt-5/5.15/fetch.sh index dcada3649078b..282c228718e42 100755 --- a/pkgs/development/libraries/qt-5/5.15/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.15/fetch.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix-prefetch-scripts jq +# shellcheck shell=bash set -eox pipefail From bd6786acb60e287e0ca3820e3d30eff975435296 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:13:58 +1300 Subject: [PATCH 084/360] v8: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/libraries/v8/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/v8/update.sh b/pkgs/development/libraries/v8/update.sh index f046bb8e6885e..b251ee034c9d1 100755 --- a/pkgs/development/libraries/v8/update.sh +++ b/pkgs/development/libraries/v8/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p curl -p nix-prefetch-git +# shellcheck shell=bash VERSION_OVERVIEW=https://omahaproxy.appspot.com/all?os=linux TARGET_CHANNEL=beta FILE_PATH=6_x.nix From 8c95b783fb1f34ba7366d8ac9a11793a2cc1aef2 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:14:02 +1300 Subject: [PATCH 085/360] google-clasp: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/misc/google-clasp/generate.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/misc/google-clasp/generate.sh b/pkgs/development/misc/google-clasp/generate.sh index 4e04231e2b89b..d4424b562013b 100755 --- a/pkgs/development/misc/google-clasp/generate.sh +++ b/pkgs/development/misc/google-clasp/generate.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix +# shellcheck shell=bash set -eu -o pipefail From fe3a2a85e0dd38e0a6e56f9caa71a35d4145dd78 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:14:05 +1300 Subject: [PATCH 086/360] hasura: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/misc/haskell/hasura/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/misc/haskell/hasura/update.sh b/pkgs/development/misc/haskell/hasura/update.sh index 77a5d5fc6dead..6ebe832948072 100755 --- a/pkgs/development/misc/haskell/hasura/update.sh +++ b/pkgs/development/misc/haskell/hasura/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p cabal2nix curl jq -I nixpkgs=. +# shellcheck shell=bash # # This script will update the hasura derivations to the latest version using # cabal2nix. From c4194c43f71501a736484af0f0c58094325a7b5e Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:14:10 +1300 Subject: [PATCH 087/360] androidenv: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/mobile/androidenv/fetchrepo.sh | 1 + pkgs/development/mobile/androidenv/querypackages.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/mobile/androidenv/fetchrepo.sh b/pkgs/development/mobile/androidenv/fetchrepo.sh index ab5bf419c31af..4aae0c3a7da98 100755 --- a/pkgs/development/mobile/androidenv/fetchrepo.sh +++ b/pkgs/development/mobile/androidenv/fetchrepo.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl +# shellcheck shell=bash die() { echo "$1" >&2 diff --git a/pkgs/development/mobile/androidenv/querypackages.sh b/pkgs/development/mobile/androidenv/querypackages.sh index 4abf4f936405e..16e7a1d5ab885 100755 --- a/pkgs/development/mobile/androidenv/querypackages.sh +++ b/pkgs/development/mobile/androidenv/querypackages.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p jq +# shellcheck shell=bash set -e From 3157b55500a94b56e1e4b94f017f474c9bcff059 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:14:21 +1300 Subject: [PATCH 088/360] cocoapods: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/mobile/cocoapods/update | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/mobile/cocoapods/update b/pkgs/development/mobile/cocoapods/update index 66f6f7b66fd41..6fb6b672b7a31 100755 --- a/pkgs/development/mobile/cocoapods/update +++ b/pkgs/development/mobile/cocoapods/update @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p bash bundix bundler +# shellcheck shell=bash set -e From db6da12aab9a273ef4adab24276cc8791df402ca Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:14:25 +1300 Subject: [PATCH 089/360] buildbot: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/python-modules/buildbot/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/buildbot/update.sh b/pkgs/development/python-modules/buildbot/update.sh index 3406f05db3e80..94438168a27bd 100755 --- a/pkgs/development/python-modules/buildbot/update.sh +++ b/pkgs/development/python-modules/buildbot/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix-update +# shellcheck shell=bash set -eu -o pipefail nix-update python3Packages.buildbot From e0152ca6a5185b71a5ad41140ce115d33aead776 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:14:29 +1300 Subject: [PATCH 090/360] pytorch: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/python-modules/pytorch/prefetch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pytorch/prefetch.sh b/pkgs/development/python-modules/pytorch/prefetch.sh index debf26bfa20a1..57f1456d41f88 100755 --- a/pkgs/development/python-modules/pytorch/prefetch.sh +++ b/pkgs/development/python-modules/pytorch/prefetch.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix-prefetch-scripts +# shellcheck shell=bash set -eou pipefail From 7432889c5d21726a04d1dcadd617e842405d0190 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:14:33 +1300 Subject: [PATCH 091/360] torchvision: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/python-modules/torchvision/prefetch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh index 686d1b3e62002..ea13a223427e8 100755 --- a/pkgs/development/python-modules/torchvision/prefetch.sh +++ b/pkgs/development/python-modules/torchvision/prefetch.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix-prefetch-scripts +# shellcheck shell=bash set -eou pipefail From f0bc7255c9c8ece7d87d56ca1c49a8b4ed320cb7 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:14:36 +1300 Subject: [PATCH 092/360] gradle: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/tools/build-managers/gradle/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/gradle/update.sh b/pkgs/development/tools/build-managers/gradle/update.sh index 03c914bbdaf4e..a7d198d1e7241 100755 --- a/pkgs/development/tools/build-managers/gradle/update.sh +++ b/pkgs/development/tools/build-managers/gradle/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix-prefetch curl jq +# shellcheck shell=bash # Generates Gradle release specs from GitHub Releases. # From c296bdcbc287416695dc39fe079aa02033b919f5 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:14:39 +1300 Subject: [PATCH 093/360] msbuild: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/tools/build-managers/msbuild/create-deps.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/msbuild/create-deps.sh b/pkgs/development/tools/build-managers/msbuild/create-deps.sh index c9bd4ba7eb6ab..32efa0d9248b7 100755 --- a/pkgs/development/tools/build-managers/msbuild/create-deps.sh +++ b/pkgs/development/tools/build-managers/msbuild/create-deps.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p jq -p xmlstarlet -p curl +# shellcheck shell=bash set -euo pipefail cat << EOL From 442c32fe68596a9e68b13dc4502c3497075f1518 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:14:43 +1300 Subject: [PATCH 094/360] dconf2nix: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/tools/haskell/dconf2nix/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/haskell/dconf2nix/update.sh b/pkgs/development/tools/haskell/dconf2nix/update.sh index 8129824e256ba..2a2dd6b148b85 100755 --- a/pkgs/development/tools/haskell/dconf2nix/update.sh +++ b/pkgs/development/tools/haskell/dconf2nix/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p cabal2nix curl jq +# shellcheck shell=bash # # This script will update the dconf2nix derivation to the latest version using # cabal2nix. From 427d8741f8df819d22ed080e8616b6888e1b06dc Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:14:49 +1300 Subject: [PATCH 095/360] coreboot-toolchain: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/tools/misc/coreboot-toolchain/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/coreboot-toolchain/update.sh b/pkgs/development/tools/misc/coreboot-toolchain/update.sh index d4c348a5d0c76..a6063f6fbc4c3 100755 --- a/pkgs/development/tools/misc/coreboot-toolchain/update.sh +++ b/pkgs/development/tools/misc/coreboot-toolchain/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell --pure -i bash -p nix cacert git getopt +# shellcheck shell=bash if [ ! -d .git ]; then echo "This script needs to be run from the root directory of nixpkgs. Exiting." From ad0591e4d68e85dc59112cfc5088ef2994e6f27a Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:14:57 +1300 Subject: [PATCH 096/360] omnisharp-roslyn: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/tools/omnisharp-roslyn/create-deps.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/omnisharp-roslyn/create-deps.sh b/pkgs/development/tools/omnisharp-roslyn/create-deps.sh index 4e4291a556023..5ec5d7f88cd9e 100755 --- a/pkgs/development/tools/omnisharp-roslyn/create-deps.sh +++ b/pkgs/development/tools/omnisharp-roslyn/create-deps.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=../../../../.. -i bash -p msbuild dotnet-sdk_3 jq xmlstarlet curl +# shellcheck shell=bash set -euo pipefail cat << EOL From 4099e4a019c3d1dedc9fbbd5a5210e5e531b8b99 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:15:00 +1300 Subject: [PATCH 097/360] poetry2nix: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update index 915726c658f55..5edc9b545203b 100755 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/update @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p curl nix-prefetch-github jq +# shellcheck shell=bash rev=$(curl -s https://api.github.com/repos/python-poetry/poetry/releases/latest | jq -r '.name') nix-prefetch-github --rev "$rev" python-poetry poetry > src.json From d118df66c14460c25dbaaf379e849f298e3fa0a4 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:15:03 +1300 Subject: [PATCH 098/360] purescript: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/tools/purescript/spago/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/purescript/spago/update.sh b/pkgs/development/tools/purescript/spago/update.sh index 12595885df3c9..7a2c05ae5bfa3 100755 --- a/pkgs/development/tools/purescript/spago/update.sh +++ b/pkgs/development/tools/purescript/spago/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p cabal2nix curl jq haskellPackages.cabal2nix-unstable -I nixpkgs=. +# shellcheck shell=bash # # This script will update the spago derivation to the latest version using # cabal2nix. From b9a038d3664b464e21de5fe599dc57ca1a513546 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:15:07 +1300 Subject: [PATCH 099/360] rust-analyzer: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/tools/rust/rust-analyzer/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/rust/rust-analyzer/update.sh b/pkgs/development/tools/rust/rust-analyzer/update.sh index add400e4d0e86..235368e8ba0d7 100755 --- a/pkgs/development/tools/rust/rust-analyzer/update.sh +++ b/pkgs/development/tools/rust/rust-analyzer/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq nix-prefetch libarchive +# shellcheck shell=bash set -euo pipefail cd "$(dirname "$0")" owner=rust-analyzer From 7fa9febf438153c65e1dcf842de1c45015030e9f Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:15:13 +1300 Subject: [PATCH 100/360] cypress: Indicate shell to ShellCheck ShellCheck SC1008. --- .../web/cypress/cypress-example-kitchensink/regen-nix | 1 + pkgs/development/web/cypress/update.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix b/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix index 86061211d7b3c..82dc9833e837b 100755 --- a/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix +++ b/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix @@ -1,6 +1,7 @@ #!/usr/bin/env nix-shell #!nix-shell ./regen-nix.nix #!nix-shell -i bash +# shellcheck shell=bash node2nix \ --nodejs-12 \ diff --git a/pkgs/development/web/cypress/update.sh b/pkgs/development/web/cypress/update.sh index f8389b517c325..f38806fc4b08b 100755 --- a/pkgs/development/web/cypress/update.sh +++ b/pkgs/development/web/cypress/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p common-updater-scripts curl jq +# shellcheck shell=bash set -euo pipefail From 04bb430a0b7ee876befb94b6fa23f0a6c91116f2 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:15:30 +1300 Subject: [PATCH 101/360] netlify-cli: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/web/netlify-cli/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/web/netlify-cli/update.sh b/pkgs/development/web/netlify-cli/update.sh index 616b3757db72d..498da39d1956b 100755 --- a/pkgs/development/web/netlify-cli/update.sh +++ b/pkgs/development/web/netlify-cli/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash +# shellcheck shell=bash set -euo pipefail mv netlify-cli.json{,.old} nix-prefetch-github-latest-release netlify cli >netlify-cli.json From e28f343a5765a1bb5e0c163d0d32e5fc1db1f2b2 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:15:33 +1300 Subject: [PATCH 102/360] newman: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/web/newman/generate-dependencies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/web/newman/generate-dependencies.sh b/pkgs/development/web/newman/generate-dependencies.sh index 7111289d29098..08f7dc614f16c 100755 --- a/pkgs/development/web/newman/generate-dependencies.sh +++ b/pkgs/development/web/newman/generate-dependencies.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix +# shellcheck shell=bash node2nix \ --node-env node-env.nix \ From 9e547d84cd76c95cbff107a2ff3e854da921dbf3 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:15:36 +1300 Subject: [PATCH 103/360] nodejs: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/web/nodejs/update-keyring | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/web/nodejs/update-keyring b/pkgs/development/web/nodejs/update-keyring index 39737758e7654..8d2d1fa1b1eeb 100755 --- a/pkgs/development/web/nodejs/update-keyring +++ b/pkgs/development/web/nodejs/update-keyring @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell --pure -i bash -p coreutils findutils gnupg curl +# shellcheck shell=bash # https://github.com/nodejs/node#release-team HOME=`mktemp -d` From a18177cd1f37da82d3dff93c7a4fd344fc63db10 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:15:39 +1300 Subject: [PATCH 104/360] abuse: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/games/abuse/abuse.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/abuse/abuse.sh b/pkgs/games/abuse/abuse.sh index de837d27181f4..459e80495559d 100644 --- a/pkgs/games/abuse/abuse.sh +++ b/pkgs/games/abuse/abuse.sh @@ -1,4 +1,5 @@ #! @shell@ +# shellcheck shell=bash if grep datadir ~/.abuse/abuserc &>/dev/null; then if [ ! -d "$(grep datadir ~/.abuse/abuserc | cut -d= -f2)" ]; then From deb9523f0304e3955d9e981f608fd907a3f8dd6a Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:15:42 +1300 Subject: [PATCH 105/360] blobby: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/games/blobby/blobby.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/blobby/blobby.sh b/pkgs/games/blobby/blobby.sh index 4c4b32b124331..44bdb6d4c6f1c 100644 --- a/pkgs/games/blobby/blobby.sh +++ b/pkgs/games/blobby/blobby.sh @@ -1,4 +1,5 @@ #! @shell@ +# shellcheck shell=bash test -d ~/.blobby || { mkdir ~/.blobby From 6ee6935db669adae81072451f3769ba615bcc361 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:16:04 +1300 Subject: [PATCH 106/360] dwarf-fortress: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/games/dwarf-fortress/themes/update.sh | 1 + pkgs/games/dwarf-fortress/update.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/games/dwarf-fortress/themes/update.sh b/pkgs/games/dwarf-fortress/themes/update.sh index 1b652bf499434..99916c586501d 100755 --- a/pkgs/games/dwarf-fortress/themes/update.sh +++ b/pkgs/games/dwarf-fortress/themes/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p jq nix coreutils curl nix-prefetch-git +# shellcheck shell=bash curl "https://api.github.com/users/dfgraphics/repos" | jq -r '.[].name | ascii_downcase' | while read repo; do version="$(curl "https://api.github.com/repos/DFgraphics/${repo}/releases/latest" | jq -r .tag_name)" diff --git a/pkgs/games/dwarf-fortress/update.sh b/pkgs/games/dwarf-fortress/update.sh index 0ef9a40c7a5d7..4fe95f64860aa 100755 --- a/pkgs/games/dwarf-fortress/update.sh +++ b/pkgs/games/dwarf-fortress/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p jq nix coreutils curl +# shellcheck shell=bash # systems to generate hashes for systems='linux linux32 osx osx32 From 80c0ccea96599b7ce95773a03529c5ec074d414b Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:16:08 +1300 Subject: [PATCH 107/360] freeorion: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/games/freeorion/fix-paths.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/freeorion/fix-paths.sh b/pkgs/games/freeorion/fix-paths.sh index def017ddc5b0a..6c356fc731b77 100644 --- a/pkgs/games/freeorion/fix-paths.sh +++ b/pkgs/games/freeorion/fix-paths.sh @@ -1,4 +1,5 @@ #!@shell@ +# shellcheck shell=bash if [ -e ~/.config/freeorion/config.xml ]; then @libxsltBin@/bin/xsltproc -o ~/.config/freeorion/config.xml @out@/share/freeorion/fix-paths.xslt ~/.config/freeorion/config.xml From 2c35af2a06a9757eb368610a5ea7348a0ff7396f Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:16:12 +1300 Subject: [PATCH 108/360] gargoyle: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/games/gargoyle/darwin.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/gargoyle/darwin.sh b/pkgs/games/gargoyle/darwin.sh index ed0daec4ef1fa..9a152a116dc62 100644 --- a/pkgs/games/gargoyle/darwin.sh +++ b/pkgs/games/gargoyle/darwin.sh @@ -1,4 +1,5 @@ #!@shell@ +# shellcheck shell=bash set -e From d7499bba8bc7936612eab4394814bef7de701953 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:16:19 +1300 Subject: [PATCH 109/360] minecraft-server: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/games/minecraft-server/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/minecraft-server/update.sh b/pkgs/games/minecraft-server/update.sh index 433a12a9caf62..8c76b8069bd52 100755 --- a/pkgs/games/minecraft-server/update.sh +++ b/pkgs/games/minecraft-server/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts +# shellcheck shell=bash BASEDIR="$(dirname "$0")" From fc97bbd10d683b24338df0fbdfd1791dbe4432dd Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:16:22 +1300 Subject: [PATCH 110/360] minecraft: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/games/minecraft/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/minecraft/update.sh b/pkgs/games/minecraft/update.sh index 485fb5a560f68..7080ea0c21b38 100755 --- a/pkgs/games/minecraft/update.sh +++ b/pkgs/games/minecraft/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts +# shellcheck shell=bash set -eu -o pipefail From 62dd7ea4815834f2ada0a48387e1223199810565 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:16:28 +1300 Subject: [PATCH 111/360] osu-lazer: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/games/osu-lazer/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/osu-lazer/update.sh b/pkgs/games/osu-lazer/update.sh index 2fe30ebec1430..40c36de8947e6 100755 --- a/pkgs/games/osu-lazer/update.sh +++ b/pkgs/games/osu-lazer/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts nuget-to-nix dotnet-sdk_5 +# shellcheck shell=bash set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" From 2c24bfb7f366bed6286e860ceaac4cded9cde4ad Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:16:38 +1300 Subject: [PATCH 112/360] sdlpop: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/games/sdlpop/prince.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/sdlpop/prince.sh b/pkgs/games/sdlpop/prince.sh index 698c347272a4f..53cfc6d8d8c23 100644 --- a/pkgs/games/sdlpop/prince.sh +++ b/pkgs/games/sdlpop/prince.sh @@ -1,4 +1,5 @@ #! @shell@ +# shellcheck shell=bash set -euo pipefail From 7327fe85f50c26b58e69f33d18d73422c323cd14 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:17:12 +1300 Subject: [PATCH 113/360] base16-builder: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/misc/base16-builder/generate.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/base16-builder/generate.sh b/pkgs/misc/base16-builder/generate.sh index 3fcfb5bcbc06e..adf9c1e7b2405 100755 --- a/pkgs/misc/base16-builder/generate.sh +++ b/pkgs/misc/base16-builder/generate.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix +# shellcheck shell=bash exec node2nix --nodejs-10 \ --input node-packages.json \ --output node-packages-generated.nix \ From 9b8b78b1d030432eaa2804a8a6217e304bd86d91 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:17:39 +1300 Subject: [PATCH 114/360] documentation-highlighter: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/misc/documentation-highlighter/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/documentation-highlighter/update.sh b/pkgs/misc/documentation-highlighter/update.sh index 3b77af4af4163..22eec512bd5d6 100755 --- a/pkgs/misc/documentation-highlighter/update.sh +++ b/pkgs/misc/documentation-highlighter/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl -p unzip +# shellcheck shell=bash set -eu set -o pipefail From f2b765c1139093bc05fe01c6651a84d969e562ca Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:17:45 +1300 Subject: [PATCH 115/360] rpcs3: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/misc/emulators/rpcs3/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/emulators/rpcs3/update.sh b/pkgs/misc/emulators/rpcs3/update.sh index 05be4dfeda1de..8644aa7827d25 100755 --- a/pkgs/misc/emulators/rpcs3/update.sh +++ b/pkgs/misc/emulators/rpcs3/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p gnused jq nix-prefetch-git curl +# shellcheck shell=bash set -eou pipefail From ea45a292c71c966fedb33053116741ed8baf5a94 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:17:50 +1300 Subject: [PATCH 116/360] ryujinx: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/misc/emulators/ryujinx/updater.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/emulators/ryujinx/updater.sh b/pkgs/misc/emulators/ryujinx/updater.sh index 16bfa3083aa19..efa33448cdcbe 100755 --- a/pkgs/misc/emulators/ryujinx/updater.sh +++ b/pkgs/misc/emulators/ryujinx/updater.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils gnused curl common-updater-scripts nuget-to-nix nix-prefetch-git jq dotnet-sdk_5 +# shellcheck shell=bash set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" From e79ca39458b107312b791fc8314e18552a896c03 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:17:54 +1300 Subject: [PATCH 117/360] my-env: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/misc/my-env/loadenv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/my-env/loadenv.sh b/pkgs/misc/my-env/loadenv.sh index 1688d2f158fb0..556f12387ba56 100644 --- a/pkgs/misc/my-env/loadenv.sh +++ b/pkgs/misc/my-env/loadenv.sh @@ -1,4 +1,5 @@ #!@shell@ +# shellcheck shell=bash OLDPATH="$PATH" OLDTZ="$TZ" @@ -19,4 +20,3 @@ if test $# -gt 0; then else exec @shell@ fi - From 843d7c361b7bdc909101fc028aac30555cd9e8da Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:18:09 +1300 Subject: [PATCH 118/360] vscode-extensions: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh | 2 +- pkgs/misc/vscode-extensions/cpptools/update_helper.sh | 2 +- .../vscode-extensions/ms-dotnettools-csharp/update-bin-srcs | 1 + pkgs/misc/vscode-extensions/vscode-lldb/update.sh | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh b/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh index f5eb08d78a5dc..20178f16d01f8 100755 --- a/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh +++ b/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -p coreutils -i bash +# shellcheck shell=bash scriptDir=$(cd "`dirname "$0"`"; pwd) echo "scriptDir='$scriptDir'" @@ -49,4 +50,3 @@ function print_nix_version_mono() { echo "nixMonoBin='$nixMonoBin'" $nixMonoBin/mono --version } - diff --git a/pkgs/misc/vscode-extensions/cpptools/update_helper.sh b/pkgs/misc/vscode-extensions/cpptools/update_helper.sh index 00ef77553242d..ae1eced58b1fc 100755 --- a/pkgs/misc/vscode-extensions/cpptools/update_helper.sh +++ b/pkgs/misc/vscode-extensions/cpptools/update_helper.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -p coreutils -p jq -p unzip -i bash +# shellcheck shell=bash set -euo pipefail # @@ -165,4 +166,3 @@ print_nix_version_clangtools echo echo "------------- Nix mono ---------------" print_nix_version_mono - diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs index 83230915d0b17..c9c3266d3ba06 100755 --- a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs +++ b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=../../../.. -i bash -p curl jq unzip +# shellcheck shell=bash set -euf -o pipefail declare scriptDir diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/update.sh b/pkgs/misc/vscode-extensions/vscode-lldb/update.sh index 2fe0cc5cf2978..d37d89215e598 100755 --- a/pkgs/misc/vscode-extensions/vscode-lldb/update.sh +++ b/pkgs/misc/vscode-extensions/vscode-lldb/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p jq nix-prefetch +# shellcheck shell=bash set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" if [[ $# -ne 1 ]]; then From dec322353d91031e2a56d8e8d792d276c4650f16 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:18:14 +1300 Subject: [PATCH 119/360] apple-source-releases: Indicate shell to ShellCheck ShellCheck SC1008. --- .../darwin/apple-source-releases/generate-sdk-packages.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh b/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh index d7c3fc89c525b..c951d24f8cc3d 100755 --- a/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh +++ b/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl +# shellcheck shell=bash # usage: # generate-sdk-packages.sh macos 11.0.1 From 002c9f2ac98e139baf5bb18445b788defb3bcd97 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:18:34 +1300 Subject: [PATCH 120/360] linux/kernel: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/os-specific/linux/kernel/update-libre.sh | 1 + pkgs/os-specific/linux/kernel/update-zen.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/update-libre.sh b/pkgs/os-specific/linux/kernel/update-libre.sh index aea12df55cc59..a773435e0edf9 100755 --- a/pkgs/os-specific/linux/kernel/update-libre.sh +++ b/pkgs/os-specific/linux/kernel/update-libre.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p nix-prefetch-svn git curl +# shellcheck shell=bash set -euo pipefail nixpkgs="$(git rev-parse --show-toplevel)" diff --git a/pkgs/os-specific/linux/kernel/update-zen.sh b/pkgs/os-specific/linux/kernel/update-zen.sh index 1532d7be02b3c..1c872cb069690 100755 --- a/pkgs/os-specific/linux/kernel/update-zen.sh +++ b/pkgs/os-specific/linux/kernel/update-zen.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -I nixpkgs=../../../.. -i bash -p nix-prefetch git gnused gnugrep nix curl +# shellcheck shell=bash set -euo pipefail -x nixpkgs="$(git rev-parse --show-toplevel)" From 968205625e2fb905cf98ff13e25aa8c6d18966bd Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:18:39 +1300 Subject: [PATCH 121/360] lsb-release: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/os-specific/linux/lsb-release/lsb_release.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/lsb-release/lsb_release.sh b/pkgs/os-specific/linux/lsb-release/lsb_release.sh index 47b449c316145..e1b856dcc7a0c 100644 --- a/pkgs/os-specific/linux/lsb-release/lsb_release.sh +++ b/pkgs/os-specific/linux/lsb-release/lsb_release.sh @@ -1,4 +1,5 @@ #! @shell@ +# shellcheck shell=bash set -o errexit set -o nounset From efcd1da0a8309ba4ac3edc67db582110f9388d41 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:18:43 +1300 Subject: [PATCH 122/360] nixos-rebuild: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 244e1c1d52b14..b2c8a167f656f 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -1,4 +1,5 @@ #! @runtimeShell@ +# shellcheck shell=bash if [ -x "@runtimeShell@" ]; then export SHELL="@runtimeShell@"; fi; From f2d606712625eb5fef09553f5a428e96742f0aac Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:18:46 +1300 Subject: [PATCH 123/360] rfkill: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/os-specific/linux/rfkill/rfkill-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/rfkill/rfkill-hook.sh b/pkgs/os-specific/linux/rfkill/rfkill-hook.sh index 75716e40daee8..747ae149df671 100755 --- a/pkgs/os-specific/linux/rfkill/rfkill-hook.sh +++ b/pkgs/os-specific/linux/rfkill/rfkill-hook.sh @@ -1,4 +1,5 @@ #!@shell@ +# shellcheck shell=bash # Executes a hook in case of a change to the # rfkill state. The hook can be passed as From e52eba16dc2002916099f3a2375e69ae63fd03fd Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:18:51 +1300 Subject: [PATCH 124/360] service-wrapper: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/os-specific/linux/service-wrapper/service-wrapper.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh b/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh index 2889adc186860..6b435955258bb 100755 --- a/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh +++ b/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh @@ -1,4 +1,5 @@ #!@shell@ +# shellcheck shell=bash ########################################################################### # /usr/bin/service From e9043ed6865e456e62d632d53cc8b31f4e943659 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:18:55 +1300 Subject: [PATCH 125/360] adguardhome: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/adguardhome/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/adguardhome/update.sh b/pkgs/servers/adguardhome/update.sh index 69f1d8e97fdea..91f71fc81fc1b 100755 --- a/pkgs/servers/adguardhome/update.sh +++ b/pkgs/servers/adguardhome/update.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p curl gnugrep nix-prefetch jq +# shellcheck shell=bash # This file is based on /pkgs/servers/gotify/update.sh From aa7064aa12929bb5327f9adc3e94acf9503cc03b Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:18:59 +1300 Subject: [PATCH 126/360] wiktionary: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/dict/wiktionary/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/dict/wiktionary/update.sh b/pkgs/servers/dict/wiktionary/update.sh index ff5e0fc3551aa..a2890b53f8f3f 100755 --- a/pkgs/servers/dict/wiktionary/update.sh +++ b/pkgs/servers/dict/wiktionary/update.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p common-updater-scripts python3 +# shellcheck shell=bash set -ueo pipefail From f5498c1bf3de8fe7fbd82921d9e32ec3581245a9 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:19:02 +1300 Subject: [PATCH 127/360] gotify: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/gotify/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/gotify/update.sh b/pkgs/servers/gotify/update.sh index f0a40e30c9138..1d6db453b159d 100755 --- a/pkgs/servers/gotify/update.sh +++ b/pkgs/servers/gotify/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p wget yarn2nix-moretea.yarn2nix nix-prefetch-git jq +# shellcheck shell=bash set -euo pipefail From 4e611fe77f68323d041b6c3b105ef647cdae7549 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:19:06 +1300 Subject: [PATCH 128/360] home-assistant: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/home-assistant/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/update.sh b/pkgs/servers/home-assistant/update.sh index 8a47daf51c55c..7861072773e36 100755 --- a/pkgs/servers/home-assistant/update.sh +++ b/pkgs/servers/home-assistant/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -p nix -p jq -p curl -p bash -p git -p nix-update -i bash +# shellcheck shell=bash set -eux From 1ed47703770a5bca192cef4b60c698361849dae5 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:19:10 +1300 Subject: [PATCH 129/360] jellyfin: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/jellyfin/update.sh | 1 + pkgs/servers/jellyfin/web-update.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/servers/jellyfin/update.sh b/pkgs/servers/jellyfin/update.sh index a725dc08fc989..5fab78b7f08b0 100755 --- a/pkgs/servers/jellyfin/update.sh +++ b/pkgs/servers/jellyfin/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts dotnetCorePackages.sdk_5_0 nuget-to-nix gnused nix coreutils findutils +# shellcheck shell=bash set -euo pipefail diff --git a/pkgs/servers/jellyfin/web-update.sh b/pkgs/servers/jellyfin/web-update.sh index 87b05efc2d902..a23d110948a1d 100755 --- a/pkgs/servers/jellyfin/web-update.sh +++ b/pkgs/servers/jellyfin/web-update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl common-updater-scripts nodePackages.node2nix gnused nix coreutils jq +# shellcheck shell=bash set -euo pipefail From 1a044cdb1d52c12f746f6bb2a114b7dc3f33a973 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:19:14 +1300 Subject: [PATCH 130/360] jicofo: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/jicofo/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/jicofo/update.sh b/pkgs/servers/jicofo/update.sh index 538e17d93da7b..4c699b0924696 100755 --- a/pkgs/servers/jicofo/update.sh +++ b/pkgs/servers/jicofo/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl pup common-updater-scripts +# shellcheck shell=bash set -eu -o pipefail From 006cca9906c884b6a27bbafed82bbba2d8bfc578 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:19:20 +1300 Subject: [PATCH 131/360] jitsi-videobridge: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/jitsi-videobridge/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/jitsi-videobridge/update.sh b/pkgs/servers/jitsi-videobridge/update.sh index bee9c4aa6de28..8bd479baa7ac0 100755 --- a/pkgs/servers/jitsi-videobridge/update.sh +++ b/pkgs/servers/jitsi-videobridge/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl pup common-updater-scripts +# shellcheck shell=bash set -eu -o pipefail From db888f4cdef3a8afd155cad187d2f79efd98fe50 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:19:26 +1300 Subject: [PATCH 132/360] matrix-appservice-discord: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/matrix-appservice-discord/generate.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/matrix-appservice-discord/generate.sh b/pkgs/servers/matrix-appservice-discord/generate.sh index 582d3a96fba37..c6055244570f8 100755 --- a/pkgs/servers/matrix-appservice-discord/generate.sh +++ b/pkgs/servers/matrix-appservice-discord/generate.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=../../../ -i bash -p wget yarn2nix +# shellcheck shell=bash set -euo pipefail From 8494514a7cf68cf6a2aaa770ce792646b0ad0b55 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:19:32 +1300 Subject: [PATCH 133/360] matrix-synapse: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh | 1 + .../matrix-appservice-slack/generate-dependencies.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh b/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh index 462512dd0f4db..058669d9e9e82 100755 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix nodejs-12_x curl jq nix +# shellcheck shell=bash set -euo pipefail # cd to the folder containing this script diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh b/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh index 33f0554573bdc..a081dfbc6aae9 100755 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix +# shellcheck shell=bash # Download package.json and package-lock.json from the v1.9.0 release curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.9.0/package.json -o package.json From 724cf980355978805e757d8d1ec3e57a9cd8cd1c Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:19:36 +1300 Subject: [PATCH 134/360] mjolnir: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/mjolnir/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/mjolnir/update.sh b/pkgs/servers/mjolnir/update.sh index 6c7b2fb417b3b..8533bdfb3f5ac 100755 --- a/pkgs/servers/mjolnir/update.sh +++ b/pkgs/servers/mjolnir/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl common-updater-scripts nodePackages.node2nix gnused nix coreutils jq +# shellcheck shell=bash set -euo pipefail @@ -26,4 +27,3 @@ node2nix \ --output ./node-deps.nix \ --input "$store_src/package.json" \ --composition ./node-composition.nix - From 1ae04de61cef442c6583a7930956270c8c0dcf8b Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:19:42 +1300 Subject: [PATCH 135/360] grafana: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh b/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh index dd8f050c633c4..bbbb0e4151d91 100755 --- a/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh +++ b/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts +# shellcheck shell=bash set -eu -o pipefail From 0212e2960d2b93a617b53f520e3ddc62341cea02 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:19:46 +1300 Subject: [PATCH 136/360] prometheus: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/monitoring/prometheus/webui/update-web-deps.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/monitoring/prometheus/webui/update-web-deps.sh b/pkgs/servers/monitoring/prometheus/webui/update-web-deps.sh index 328488e81e5af..804a737d2e8e5 100755 --- a/pkgs/servers/monitoring/prometheus/webui/update-web-deps.sh +++ b/pkgs/servers/monitoring/prometheus/webui/update-web-deps.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix +# shellcheck shell=bash set -euo pipefail if [[ "$#" -ne 1 || "$1" == -* ]]; then From 7da3ea5b6708ca849a8c4b92bfd2f1e7fa385cc9 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:19:50 +1300 Subject: [PATCH 137/360] uchiwa: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/monitoring/uchiwa/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/monitoring/uchiwa/update.sh b/pkgs/servers/monitoring/uchiwa/update.sh index 10da7f8adbf93..323612c562e05 100755 --- a/pkgs/servers/monitoring/uchiwa/update.sh +++ b/pkgs/servers/monitoring/uchiwa/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl.bin git.out nix jq.out nodePackages.bower2nix +# shellcheck shell=bash set -euo pipefail IFS=$'\n\t' From 86b15096569badeadb1d8832caf0e1ee3e3a47e4 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:19:56 +1300 Subject: [PATCH 138/360] mx-puppet-discord: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/mx-puppet-discord/generate.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/mx-puppet-discord/generate.sh b/pkgs/servers/mx-puppet-discord/generate.sh index 851671a147a88..c3d60de4c75d3 100755 --- a/pkgs/servers/mx-puppet-discord/generate.sh +++ b/pkgs/servers/mx-puppet-discord/generate.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix +# shellcheck shell=bash # No official release rev=c17384a6a12a42a528e0b1259f8073e8db89b8f4 From 89a2b1ed1b2fd8c9e0a8bca1918eba54e08006fe Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:20:00 +1300 Subject: [PATCH 139/360] influxdb2: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/nosql/influxdb2/update-influxdb2.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/nosql/influxdb2/update-influxdb2.sh b/pkgs/servers/nosql/influxdb2/update-influxdb2.sh index 826fa92515778..b35e7f65f8cad 100755 --- a/pkgs/servers/nosql/influxdb2/update-influxdb2.sh +++ b/pkgs/servers/nosql/influxdb2/update-influxdb2.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=../../../../ -i bash -p wget yarn2nix +# shellcheck shell=bash set -euo pipefail From 84831d1f3ca78a6ea2e6a4fd86faec0b8928fb41 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:20:02 +1300 Subject: [PATCH 140/360] ombi: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/ombi/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/ombi/update.sh b/pkgs/servers/ombi/update.sh index 1503edde99837..1082e770988e1 100755 --- a/pkgs/servers/ombi/update.sh +++ b/pkgs/servers/ombi/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnused nix-prefetch jq +# shellcheck shell=bash set -e From 8a4d2f0635f965b6f1995e3cef63818fca866ac6 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:20:16 +1300 Subject: [PATCH 141/360] prowlarr: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/prowlarr/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/prowlarr/update.sh b/pkgs/servers/prowlarr/update.sh index d61edda5a0a31..f41d478a1a0e5 100755 --- a/pkgs/servers/prowlarr/update.sh +++ b/pkgs/servers/prowlarr/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnused nix-prefetch jq +# shellcheck shell=bash set -eou pipefail From 4def68fd6c0365a5c535d626ad3e2c760a01d17c Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:20:19 +1300 Subject: [PATCH 142/360] radarr: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/radarr/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/radarr/update.sh b/pkgs/servers/radarr/update.sh index 240689eb45379..21d90173d99b5 100755 --- a/pkgs/servers/radarr/update.sh +++ b/pkgs/servers/radarr/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnused nix-prefetch jq +# shellcheck shell=bash set -e From 18575c896937b046f745fe7057e435a353828859 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:20:23 +1300 Subject: [PATCH 143/360] bookstack: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/web-apps/bookstack/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/web-apps/bookstack/update.sh b/pkgs/servers/web-apps/bookstack/update.sh index f61a511059020..57eff811858ed 100755 --- a/pkgs/servers/web-apps/bookstack/update.sh +++ b/pkgs/servers/web-apps/bookstack/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nix curl jq nix-update +# shellcheck shell=bash # check if composer2nix is installed if ! command -v composer2nix &> /dev/null; then From 7ff81d0fb4eb1f07b24bb32c88a53424830dfe15 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:20:27 +1300 Subject: [PATCH 144/360] cryptpad: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/web-apps/cryptpad/generate.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/web-apps/cryptpad/generate.sh b/pkgs/servers/web-apps/cryptpad/generate.sh index 925420c49a58d..f701057552ffb 100755 --- a/pkgs/servers/web-apps/cryptpad/generate.sh +++ b/pkgs/servers/web-apps/cryptpad/generate.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -I nixpkgs=../../../.. -p nodePackages.node2nix nix +# shellcheck shell=bash # This script is meant to be run in the current directory From 34341289dec80f92f562a37d53c67cb6d6fe7a72 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:20:31 +1300 Subject: [PATCH 145/360] discourse: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/web-apps/discourse/plugins/up-plugin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/discourse/plugins/up-plugin.sh b/pkgs/servers/web-apps/discourse/plugins/up-plugin.sh index ba103c5f6b2bc..36c62a109cdc3 100755 --- a/pkgs/servers/web-apps/discourse/plugins/up-plugin.sh +++ b/pkgs/servers/web-apps/discourse/plugins/up-plugin.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p bash curl ruby.devEnv git sqlite libpcap postgresql libxml2 libxslt pkg-config bundix gnumake +# shellcheck shell=bash # src https://nixos.wiki/wiki/Packaging/Ruby # This script should be ran afte rupdating a plugin that has a gemset.nix @@ -36,4 +37,3 @@ source "https://rubygems.org"' > Gemfile bundix cp Gemfile Gemfile.lock gemset.nix "$PL_DIR" fi - From 98f5b87cf32e3dd3915c67d6e523332468926c65 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:20:35 +1300 Subject: [PATCH 146/360] hedgedoc: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/web-apps/hedgedoc/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/web-apps/hedgedoc/update.sh b/pkgs/servers/web-apps/hedgedoc/update.sh index e61101e4574b8..ff17434802756 100755 --- a/pkgs/servers/web-apps/hedgedoc/update.sh +++ b/pkgs/servers/web-apps/hedgedoc/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github +# shellcheck shell=bash if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then echo "Regenerates packaging data for the element packages." From 7431b2c7b07f079684a2a23060917d223cbe3623 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:20:39 +1300 Subject: [PATCH 147/360] jitsi-meet: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/web-apps/jitsi-meet/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/web-apps/jitsi-meet/update.sh b/pkgs/servers/web-apps/jitsi-meet/update.sh index 9c80fa4e60394..d8f642d6ba0e9 100755 --- a/pkgs/servers/web-apps/jitsi-meet/update.sh +++ b/pkgs/servers/web-apps/jitsi-meet/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl pup common-updater-scripts +# shellcheck shell=bash set -eu -o pipefail From b106a55cf5fc2588effeba154f8ea14db39510c3 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:20:41 +1300 Subject: [PATCH 148/360] lemmy: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/web-apps/lemmy/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/web-apps/lemmy/update.sh b/pkgs/servers/web-apps/lemmy/update.sh index 846804a97e72f..63e41c54ddb45 100755 --- a/pkgs/servers/web-apps/lemmy/update.sh +++ b/pkgs/servers/web-apps/lemmy/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep moreutils +# shellcheck shell=bash # TODO set to `verbose` or `extdebug` once implemented in oil shopt --set xtrace From 1a99d67e6414278e193868f450fa18f89a071ab5 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:20:44 +1300 Subject: [PATCH 149/360] plausible: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/web-apps/plausible/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/web-apps/plausible/update.sh b/pkgs/servers/web-apps/plausible/update.sh index 74387212d2610..19bb950d3a552 100755 --- a/pkgs/servers/web-apps/plausible/update.sh +++ b/pkgs/servers/web-apps/plausible/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p jq nix-prefetch-github yarn yarn2nix-moretea.yarn2nix moreutils +# shellcheck shell=bash # NOTE: please check on new releases which steps aren't necessary anymore! # Currently the following things are done: From 0c6604c291acf1b979fc2a38e3352de48782a505 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:20:50 +1300 Subject: [PATCH 150/360] whitebophir: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/web-apps/whitebophir/generate.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/web-apps/whitebophir/generate.sh b/pkgs/servers/web-apps/whitebophir/generate.sh index 825def892fc54..fb2f0fba3ca1f 100755 --- a/pkgs/servers/web-apps/whitebophir/generate.sh +++ b/pkgs/servers/web-apps/whitebophir/generate.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix +# shellcheck shell=bash set -euo pipefail node2nix \ From 9c056797bca54302c0e78cf847d9f6918f5610b2 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:20:55 +1300 Subject: [PATCH 151/360] zigbee2mqtt: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/zigbee2mqtt/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/zigbee2mqtt/update.sh b/pkgs/servers/zigbee2mqtt/update.sh index 14c4d93261d13..ce78964876574 100755 --- a/pkgs/servers/zigbee2mqtt/update.sh +++ b/pkgs/servers/zigbee2mqtt/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix nodejs-12_x curl jq nix-update +# shellcheck shell=bash CURRENT_VERSION=$(nix eval --raw '(with import ../../.. {}; zigbee2mqtt.version)') TARGET_VERSION=$(curl https://api.github.com/repos/Koenkk/zigbee2mqtt/releases/latest | jq -r ".tag_name") From b5a7712f6e17bf140890a6283c72088278bdd301 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:20:58 +1300 Subject: [PATCH 152/360] xpra: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/X11/xpra/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/X11/xpra/update.sh b/pkgs/tools/X11/xpra/update.sh index c1b408a0beef3..77ca7a20feb5a 100755 --- a/pkgs/tools/X11/xpra/update.sh +++ b/pkgs/tools/X11/xpra/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl perl common-updater-scripts +# shellcheck shell=bash version=$(curl https://xpra.org/src/ | perl -ne 'print "$1\n" if /xpra-([[:digit:].]+)\./' | sort -V | tail -n1) update-source-version xpra "$version" From de13bdcc3bbffed2e407943b3ecc11fffbf5867b Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:21:02 +1300 Subject: [PATCH 153/360] meshcentral: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/admin/meshcentral/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/admin/meshcentral/update.sh b/pkgs/tools/admin/meshcentral/update.sh index f7f12078372ed..fc78239afb7f5 100755 --- a/pkgs/tools/admin/meshcentral/update.sh +++ b/pkgs/tools/admin/meshcentral/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodejs yarn yarn2nix jq rsync common-updater-scripts moreutils +# shellcheck shell=bash set -exuo pipefail From d67d2ff23e79ba8bc15c1d2fc06d822efceebaf1 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:21:07 +1300 Subject: [PATCH 154/360] rpmextract: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/archivers/rpmextract/rpmextract.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/archivers/rpmextract/rpmextract.sh b/pkgs/tools/archivers/rpmextract/rpmextract.sh index 6ebfa251955d4..896fbe0276fc9 100644 --- a/pkgs/tools/archivers/rpmextract/rpmextract.sh +++ b/pkgs/tools/archivers/rpmextract/rpmextract.sh @@ -1,4 +1,5 @@ #!@shell@ -e +# shellcheck shell=bash if [ "$1" = "" ]; then echo "usage: rpmextract package_name..." 1>&2 From e224b24e3dcf66e31c5ff07950b7cbc3dda77292 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:21:15 +1300 Subject: [PATCH 155/360] discordchatexporter-cli: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/backup/discordchatexporter-cli/updater.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/backup/discordchatexporter-cli/updater.sh b/pkgs/tools/backup/discordchatexporter-cli/updater.sh index 1fc261c298038..23d027bc9031a 100755 --- a/pkgs/tools/backup/discordchatexporter-cli/updater.sh +++ b/pkgs/tools/backup/discordchatexporter-cli/updater.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts nuget-to-nix dotnet-sdk_5 +# shellcheck shell=bash set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" From 857b505768efc535cd3f6140101d534f50385221 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:21:19 +1300 Subject: [PATCH 156/360] rmfuse: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/filesystems/rmfuse/update | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/filesystems/rmfuse/update b/pkgs/tools/filesystems/rmfuse/update index 77cfe9ff86d9c..ec5ab549dbab0 100755 --- a/pkgs/tools/filesystems/rmfuse/update +++ b/pkgs/tools/filesystems/rmfuse/update @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p poetry poetry2nix.cli +# shellcheck shell=bash set -eu poetry lock poetry2nix lock From 9acf1138ab741e662991266e3a5ca33e6d7eab04 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:21:26 +1300 Subject: [PATCH 157/360] ldgallery: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/tools/graphics/ldgallery/compiler/generate.sh | 1 + pkgs/tools/graphics/ldgallery/viewer/generate.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/tools/graphics/ldgallery/compiler/generate.sh b/pkgs/tools/graphics/ldgallery/compiler/generate.sh index 355206cb0ff9d..b1b8e81321650 100755 --- a/pkgs/tools/graphics/ldgallery/compiler/generate.sh +++ b/pkgs/tools/graphics/ldgallery/compiler/generate.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p cabal2nix +# shellcheck shell=bash set -euo pipefail diff --git a/pkgs/tools/graphics/ldgallery/viewer/generate.sh b/pkgs/tools/graphics/ldgallery/viewer/generate.sh index f115fb11d9b93..d89bfc2e0d1c6 100755 --- a/pkgs/tools/graphics/ldgallery/viewer/generate.sh +++ b/pkgs/tools/graphics/ldgallery/viewer/generate.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=../../../../.. -i bash -p nodePackages.node2nix +# shellcheck shell=bash # TODO: merge with other node packages in nixpkgs/pkgs/development/node-packages once # * support for npm projects in sub-directories is added to node2nix: From 4283e32addd2b917f89eb5880865fba9bab413e5 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:21:31 +1300 Subject: [PATCH 158/360] depotdownloader: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/misc/depotdownloader/fetch-deps.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/depotdownloader/fetch-deps.sh b/pkgs/tools/misc/depotdownloader/fetch-deps.sh index a767f3fea9bf3..0052d657d3c75 100755 --- a/pkgs/tools/misc/depotdownloader/fetch-deps.sh +++ b/pkgs/tools/misc/depotdownloader/fetch-deps.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p nuget-to-nix dotnet-sdk_5 +# shellcheck shell=bash set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" From 60396e9ee4465ea3ba296c098dddae591fd864dd Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:21:34 +1300 Subject: [PATCH 159/360] grub: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/misc/grub/grub1.patches.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/grub/grub1.patches.sh b/pkgs/tools/misc/grub/grub1.patches.sh index a7db25afb64f3..141200bad1283 100755 --- a/pkgs/tools/misc/grub/grub1.patches.sh +++ b/pkgs/tools/misc/grub/grub1.patches.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -p nix -i bash --pure +# shellcheck shell=bash # Does like `maintainers/scripts/debian-patches.sh`, but specialized for # grub1 patches, and using the new salsa service. From 114cd0048fcbc36cace4cac1cdea35711dee305f Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:21:38 +1300 Subject: [PATCH 160/360] sharedown: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/misc/sharedown/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/sharedown/update.sh b/pkgs/tools/misc/sharedown/update.sh index 5ba572f23698c..10373febde647 100755 --- a/pkgs/tools/misc/sharedown/update.sh +++ b/pkgs/tools/misc/sharedown/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix-update yarn yarn2nix-moretea.yarn2nix +# shellcheck shell=bash set -euo pipefail From f251ef8b32c249066775134673f64930e4e3db71 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:21:41 +1300 Subject: [PATCH 161/360] airfield: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/networking/airfield/deps.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/airfield/deps.sh b/pkgs/tools/networking/airfield/deps.sh index f33ec8e2ab566..82dbee8a9fe4d 100755 --- a/pkgs/tools/networking/airfield/deps.sh +++ b/pkgs/tools/networking/airfield/deps.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix +# shellcheck shell=bash node2nix --nodejs-10 -i deps.json \ --no-copy-node-env \ From 109b9812f91845fc467942790948659180b890ac Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:21:44 +1300 Subject: [PATCH 162/360] boundary: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/networking/boundary/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/boundary/update.sh b/pkgs/tools/networking/boundary/update.sh index 437339307104d..864190b42f129 100755 --- a/pkgs/tools/networking/boundary/update.sh +++ b/pkgs/tools/networking/boundary/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnused gawk nix-prefetch +# shellcheck shell=bash set -euo pipefail From c44c167e45618a46cccb9e29aff2b89615f0555a Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:21:48 +1300 Subject: [PATCH 163/360] ngrok-2: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/networking/ngrok-2/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/ngrok-2/update.sh b/pkgs/tools/networking/ngrok-2/update.sh index 4e2aaf4e5596b..5aa3fdc39ac6c 100755 --- a/pkgs/tools/networking/ngrok-2/update.sh +++ b/pkgs/tools/networking/ngrok-2/update.sh @@ -2,6 +2,7 @@ #!nix-shell -p httpie #!nix-shell -p jq #!nix-shell -i bash +# shellcheck shell=bash set -eu -o pipefail From 61f8a4da406b08ebba03df920c963386dff9116c Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:21:51 +1300 Subject: [PATCH 164/360] v2ray: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/networking/v2ray/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/v2ray/update.sh b/pkgs/tools/networking/v2ray/update.sh index f645b8ea09396..4c9ed917385e9 100755 --- a/pkgs/tools/networking/v2ray/update.sh +++ b/pkgs/tools/networking/v2ray/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq +# shellcheck shell=bash set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" From 5a389673cb2181fad323c29536a8a07f1c77ce6f Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:21:55 +1300 Subject: [PATCH 165/360] wireguard-go: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/networking/wireguard-go/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/wireguard-go/update.sh b/pkgs/tools/networking/wireguard-go/update.sh index 2b6b8317a1e88..cdf6e73102059 100755 --- a/pkgs/tools/networking/wireguard-go/update.sh +++ b/pkgs/tools/networking/wireguard-go/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnused common-updater-scripts vgo2nix +# shellcheck shell=bash set -eu -o pipefail From a769c21a45bf4dc8c8ab6db8cf11b0d9b2d565cc Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:22:00 +1300 Subject: [PATCH 166/360] wireguard-tools: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/networking/wireguard-tools/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/wireguard-tools/update.sh b/pkgs/tools/networking/wireguard-tools/update.sh index e549228e8f1fb..c6a3de37c36f5 100755 --- a/pkgs/tools/networking/wireguard-tools/update.sh +++ b/pkgs/tools/networking/wireguard-tools/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnused common-updater-scripts +# shellcheck shell=bash set -eu -o pipefail From 1e9fc061158b80c7b05255e3675c5897b2fe8579 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:22:04 +1300 Subject: [PATCH 167/360] metasploit: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/security/metasploit/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/metasploit/update.sh b/pkgs/tools/security/metasploit/update.sh index ba41b78c0e8d8..9a8574f2bf7b3 100755 --- a/pkgs/tools/security/metasploit/update.sh +++ b/pkgs/tools/security/metasploit/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl bundix git libiconv libpcap libxml2 libxslt pkg-config postgresql ruby.devEnv sqlite xmlstarlet nix-update +# shellcheck shell=bash set -eu -o pipefail cd "$(dirname "$(readlink -f "$0")")" From 3e7efe4fd51faaa5e42f61087f1d2bfc505ee7ac Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:22:09 +1300 Subject: [PATCH 168/360] oath-toolkit: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/security/oath-toolkit/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/oath-toolkit/update.sh b/pkgs/tools/security/oath-toolkit/update.sh index 3502a541fa8ca..d344f7644e714 100755 --- a/pkgs/tools/security/oath-toolkit/update.sh +++ b/pkgs/tools/security/oath-toolkit/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl git gnugrep nix +# shellcheck shell=bash set -euo pipefail From df183ff1112b4321065f1800c1be82f512d039cb Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:22:12 +1300 Subject: [PATCH 169/360] onlykey: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/security/onlykey/generate.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/onlykey/generate.sh b/pkgs/tools/security/onlykey/generate.sh index ec37304923238..441fdaf75a17b 100755 --- a/pkgs/tools/security/onlykey/generate.sh +++ b/pkgs/tools/security/onlykey/generate.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix +# shellcheck shell=bash # XXX: --development is given here because we need access to gulp in order to build OnlyKey. exec node2nix --nodejs-14 --development -i package.json -c onlykey.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env From 86613df5a46c958ae964c1eb3c83b7a9f8bb1ac6 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:22:15 +1300 Subject: [PATCH 170/360] wpscan: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/security/wpscan/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/wpscan/update.sh b/pkgs/tools/security/wpscan/update.sh index 4e55a770fd4ee..2eef899a6e8ee 100755 --- a/pkgs/tools/security/wpscan/update.sh +++ b/pkgs/tools/security/wpscan/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p bash bundix bundler +# shellcheck shell=bash set -e From d1ac1d4517746ac297fd530a0af0ec6f459aaa9e Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:22:20 +1300 Subject: [PATCH 171/360] linode-cli: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/virtualization/linode-cli/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/virtualization/linode-cli/update.sh b/pkgs/tools/virtualization/linode-cli/update.sh index dd37e41c53738..7991b7062aa27 100755 --- a/pkgs/tools/virtualization/linode-cli/update.sh +++ b/pkgs/tools/virtualization/linode-cli/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused jq yq-go +# shellcheck shell=bash set -x -eu -o pipefail From ea0cd24d9c9573c9635d2dfa90389ed8cda4dd68 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:24:52 +1300 Subject: [PATCH 172/360] emacs: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/editors/emacs/elisp-packages/update-melpa | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-melpa b/pkgs/applications/editors/emacs/elisp-packages/update-melpa index 5c636416a5e6b..95c70797efc9a 100755 --- a/pkgs/applications/editors/emacs/elisp-packages/update-melpa +++ b/pkgs/applications/editors/emacs/elisp-packages/update-melpa @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell --show-trace ./updater-emacs.nix -i bash +# shellcheck shell=bash SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )" From cea06ffd1d88b7af77dacf865abe71e899478d7e Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:24:57 +1300 Subject: [PATCH 173/360] jekyll: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/misc/jekyll/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/jekyll/update.sh b/pkgs/applications/misc/jekyll/update.sh index 528f1062c733f..56a8f2e8a058e 100755 --- a/pkgs/applications/misc/jekyll/update.sh +++ b/pkgs/applications/misc/jekyll/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p bundix zlib +# shellcheck shell=bash set -o errexit set -o nounset From 58a7fb3bf802dbefe5bbe2d4dd28a6ad66b9fc85 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:25:00 +1300 Subject: [PATCH 174/360] mkgmap: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/misc/mkgmap/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/mkgmap/update.sh b/pkgs/applications/misc/mkgmap/update.sh index ddfca9359359d..cce40a011978b 100755 --- a/pkgs/applications/misc/mkgmap/update.sh +++ b/pkgs/applications/misc/mkgmap/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl common-updater-scripts +# shellcheck shell=bash set -euo pipefail From 26039697b9a3409618b161bc057f58e167f752b7 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:25:11 +1300 Subject: [PATCH 175/360] k3s: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/networking/cluster/k3s/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/cluster/k3s/update.sh b/pkgs/applications/networking/cluster/k3s/update.sh index 01b3434b5bae5..b240da34cdc9b 100755 --- a/pkgs/applications/networking/cluster/k3s/update.sh +++ b/pkgs/applications/networking/cluster/k3s/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused jq +# shellcheck shell=bash set -x -eu -o pipefail From b633b8cae2adf769192950caaf5d6fc80d17015a Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:25:14 +1300 Subject: [PATCH 176/360] linkerd: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/networking/cluster/linkerd/update-edge.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/cluster/linkerd/update-edge.sh b/pkgs/applications/networking/cluster/linkerd/update-edge.sh index 937d41a79423f..08f86e36153ed 100755 --- a/pkgs/applications/networking/cluster/linkerd/update-edge.sh +++ b/pkgs/applications/networking/cluster/linkerd/update-edge.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep gnused jq +# shellcheck shell=bash set -x -eu -o pipefail From c59d4d075ff52e8b6a5325749a46d35c0202bf25 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:25:17 +1300 Subject: [PATCH 177/360] androidenv: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/mobile/androidenv/mkrepo.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/mobile/androidenv/mkrepo.sh b/pkgs/development/mobile/androidenv/mkrepo.sh index fd7e22457f020..eacc6432c03e6 100755 --- a/pkgs/development/mobile/androidenv/mkrepo.sh +++ b/pkgs/development/mobile/androidenv/mkrepo.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p "ruby.withPackages (pkgs: with pkgs; [ slop nokogiri ])" +# shellcheck shell=bash set -e From c7e5c97b5106eac5e1135611cf180c0db0a32018 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:25:22 +1300 Subject: [PATCH 178/360] opentabletdriver: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/X11/opentabletdriver/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/X11/opentabletdriver/update.sh b/pkgs/tools/X11/opentabletdriver/update.sh index b18bddd75aa95..b1f3d3c68213f 100755 --- a/pkgs/tools/X11/opentabletdriver/update.sh +++ b/pkgs/tools/X11/opentabletdriver/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnused jq common-updater-scripts nuget-to-nix dotnet-sdk_5 +# shellcheck shell=bash set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" From 41d8bcc7601b2e05148eae49cf41602f1d95efa9 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 14 Nov 2021 15:25:25 +1300 Subject: [PATCH 179/360] nixui: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/tools/package-management/nixui/generate.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/package-management/nixui/generate.sh b/pkgs/tools/package-management/nixui/generate.sh index fcb610c9d3b16..bd45fd9b3fd02 100755 --- a/pkgs/tools/package-management/nixui/generate.sh +++ b/pkgs/tools/package-management/nixui/generate.sh @@ -1,4 +1,5 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix +# shellcheck shell=bash exec node2nix --nodejs-10 -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env From 7d52da9f243950e6987376ae293f498812bddde1 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 21:55:18 +1300 Subject: [PATCH 180/360] ArchiSteamFarm: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/applications/misc/ArchiSteamFarm/updater.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/ArchiSteamFarm/updater.sh b/pkgs/applications/misc/ArchiSteamFarm/updater.sh index 399ab975fd30e..c706d52e1d012 100755 --- a/pkgs/applications/misc/ArchiSteamFarm/updater.sh +++ b/pkgs/applications/misc/ArchiSteamFarm/updater.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnused jq common-updater-scripts nuget-to-nix dotnet-sdk_5 +# shellcheck shell=bash set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" From d88c38cfabc7ba740f74c42368af398cbac8bd5e Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 21:55:50 +1300 Subject: [PATCH 181/360] dotnet: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/compilers/dotnet/print-hashes.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/dotnet/print-hashes.sh b/pkgs/development/compilers/dotnet/print-hashes.sh index 5c97c3132338f..b27339c0071ad 100755 --- a/pkgs/development/compilers/dotnet/print-hashes.sh +++ b/pkgs/development/compilers/dotnet/print-hashes.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl +# shellcheck shell=bash set -eu From b9e763865e0dfa3a2b3bbae571fc9bc9c7baf914 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 21:56:04 +1300 Subject: [PATCH 182/360] libtorch:: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/libraries/science/math/libtorch/prefetch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/science/math/libtorch/prefetch.sh b/pkgs/development/libraries/science/math/libtorch/prefetch.sh index 26b24198e235a..2e1e53d08a820 100755 --- a/pkgs/development/libraries/science/math/libtorch/prefetch.sh +++ b/pkgs/development/libraries/science/math/libtorch/prefetch.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix-prefetch-scripts +# shellcheck shell=bash set -eou pipefail From c2d5c63116c93722a11876a068455b270b8ea2fb Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 21:56:18 +1300 Subject: [PATCH 183/360] torchaudio: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/development/python-modules/torchaudio/prefetch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh index 4e62ab4ed359f..58b7a5b0e29b0 100755 --- a/pkgs/development/python-modules/torchaudio/prefetch.sh +++ b/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix-prefetch-scripts +# shellcheck shell=bash set -eou pipefail From f76e863573365454d36e96ebd233afe02716eb77 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 21:56:42 +1300 Subject: [PATCH 184/360] jackett: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/jackett/updater.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/jackett/updater.sh b/pkgs/servers/jackett/updater.sh index cd0226d6b69a2..9aa26bada4769 100755 --- a/pkgs/servers/jackett/updater.sh +++ b/pkgs/servers/jackett/updater.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts nuget-to-nix dotnet-sdk_5 +# shellcheck shell=bash set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" From 42cb2b5a7383bbdffead67f6e5d673a8b3f08139 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 21:56:53 +1300 Subject: [PATCH 185/360] eventstore: Indicate shell to ShellCheck ShellCheck SC1008. --- pkgs/servers/nosql/eventstore/create-deps.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/nosql/eventstore/create-deps.sh b/pkgs/servers/nosql/eventstore/create-deps.sh index 7b1acd5ab26f1..12ce7d516a68f 100755 --- a/pkgs/servers/nosql/eventstore/create-deps.sh +++ b/pkgs/servers/nosql/eventstore/create-deps.sh @@ -1,5 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p dotnet-sdk_5 jq xmlstarlet curl nixpkgs-fmt +# shellcheck shell=bash set -euo pipefail # Run this script to generate deps.nix From 1aedd2b35829ab1798c29aeacaa91141ccbce7b6 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:12:08 +1300 Subject: [PATCH 186/360] tex: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/tools/typesetting/tex/nix/animatedot.sh | 1 + pkgs/tools/typesetting/tex/nix/dot2pdf.sh | 2 +- pkgs/tools/typesetting/tex/nix/dot2ps.sh | 2 +- pkgs/tools/typesetting/tex/nix/find-lhs2tex-includes.sh | 1 + pkgs/tools/typesetting/tex/nix/lhs2tex.sh | 2 +- pkgs/tools/typesetting/tex/nix/run-latex.sh | 1 + pkgs/tools/typesetting/tex/tetex/setup-hook.sh | 1 + pkgs/tools/typesetting/tex/texlive/setup-hook.sh | 1 + 8 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tex/nix/animatedot.sh b/pkgs/tools/typesetting/tex/nix/animatedot.sh index f038b83ff7ad9..4461130d19408 100644 --- a/pkgs/tools/typesetting/tex/nix/animatedot.sh +++ b/pkgs/tools/typesetting/tex/nix/animatedot.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup mkdir -p $out diff --git a/pkgs/tools/typesetting/tex/nix/dot2pdf.sh b/pkgs/tools/typesetting/tex/nix/dot2pdf.sh index 71cf601dfac04..d3e21d159e344 100644 --- a/pkgs/tools/typesetting/tex/nix/dot2pdf.sh +++ b/pkgs/tools/typesetting/tex/nix/dot2pdf.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup mkdir -p $out @@ -17,4 +18,3 @@ for i in $dotGraph; do dot2pdf $i fi done - diff --git a/pkgs/tools/typesetting/tex/nix/dot2ps.sh b/pkgs/tools/typesetting/tex/nix/dot2ps.sh index dd8de4a23dbc4..69184a508f410 100644 --- a/pkgs/tools/typesetting/tex/nix/dot2ps.sh +++ b/pkgs/tools/typesetting/tex/nix/dot2ps.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup mkdir -p $out @@ -16,4 +17,3 @@ for i in $dotGraph; do dot2ps $i fi done - diff --git a/pkgs/tools/typesetting/tex/nix/find-lhs2tex-includes.sh b/pkgs/tools/typesetting/tex/nix/find-lhs2tex-includes.sh index 2dc12aa517a74..4776017781331 100644 --- a/pkgs/tools/typesetting/tex/nix/find-lhs2tex-includes.sh +++ b/pkgs/tools/typesetting/tex/nix/find-lhs2tex-includes.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash echo '[' > $out grep '^%include ' $src | cut -d ' ' -f 2 | sed 's/^\(.*\)$/"\1"/' >> $out echo ']' >> $out diff --git a/pkgs/tools/typesetting/tex/nix/lhs2tex.sh b/pkgs/tools/typesetting/tex/nix/lhs2tex.sh index bfef3df6b0e1f..22da5ac76cf52 100644 --- a/pkgs/tools/typesetting/tex/nix/lhs2tex.sh +++ b/pkgs/tools/typesetting/tex/nix/lhs2tex.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup mkdir -p $out @@ -16,4 +17,3 @@ lhstex() { } lhstex $source - diff --git a/pkgs/tools/typesetting/tex/nix/run-latex.sh b/pkgs/tools/typesetting/tex/nix/run-latex.sh index 3f8a16580ea58..ca01ca1e2c32f 100644 --- a/pkgs/tools/typesetting/tex/nix/run-latex.sh +++ b/pkgs/tools/typesetting/tex/nix/run-latex.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup mkdir -p $out diff --git a/pkgs/tools/typesetting/tex/tetex/setup-hook.sh b/pkgs/tools/typesetting/tex/tetex/setup-hook.sh index 5faef7fe5df5e..a3f1038e6213b 100644 --- a/pkgs/tools/typesetting/tex/tetex/setup-hook.sh +++ b/pkgs/tools/typesetting/tex/tetex/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addTeXMFPath () { if test -d "$1/share/texmf-nix"; then export TEXINPUTS="${TEXINPUTS}${TEXINPUTS:+:}$1/share/texmf-nix//:" diff --git a/pkgs/tools/typesetting/tex/texlive/setup-hook.sh b/pkgs/tools/typesetting/tex/texlive/setup-hook.sh index 5faef7fe5df5e..a3f1038e6213b 100644 --- a/pkgs/tools/typesetting/tex/texlive/setup-hook.sh +++ b/pkgs/tools/typesetting/tex/texlive/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addTeXMFPath () { if test -d "$1/share/texmf-nix"; then export TEXINPUTS="${TEXINPUTS}${TEXINPUTS:+:}$1/share/texmf-nix//:" From 296574fa314a387bf55f8e4a981bf37b3dfd99f4 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:12:22 +1300 Subject: [PATCH 187/360] lout: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/tools/typesetting/lout/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/typesetting/lout/builder.sh b/pkgs/tools/typesetting/lout/builder.sh index eab37c3c68fb5..fc76f29eb5800 100755 --- a/pkgs/tools/typesetting/lout/builder.sh +++ b/pkgs/tools/typesetting/lout/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Prepare a makefile specifying the appropriate output directories. # # Written by Ludovic Courtès . From b20e026f2e07288eb3df6bdb1627b75e0aec503a Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:12:34 +1300 Subject: [PATCH 188/360] opensp: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/tools/text/sgml/opensp/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/text/sgml/opensp/setup-hook.sh b/pkgs/tools/text/sgml/opensp/setup-hook.sh index 5bace3c668892..33542999bce56 100644 --- a/pkgs/tools/text/sgml/opensp/setup-hook.sh +++ b/pkgs/tools/text/sgml/opensp/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addSGMLCatalogs () { if test -d $1/sgml/dtd; then for i in $(find $1/sgml/dtd -name docbook.cat); do From 0f7ef7c43fc1218f989ed5751f8a33a6c14f8780 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:12:45 +1300 Subject: [PATCH 189/360] gawk: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/tools/text/gawk/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/text/gawk/setup-hook.sh b/pkgs/tools/text/gawk/setup-hook.sh index d568cb8c7dd98..f80cf65e96625 100644 --- a/pkgs/tools/text/gawk/setup-hook.sh +++ b/pkgs/tools/text/gawk/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash local oldOpts="-u" shopt -qo nounset || oldOpts="+u" set +u From 770a3d68b2c34c6076253eba67274cb17cc90a1b Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:13:03 +1300 Subject: [PATCH 190/360] plan9port: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/tools/system/plan9port/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index b5196e512f418..3db80a8c6eaa6 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup export PLAN9=$out/plan9 From 0a9cfddcb073a7d707371815a106c7695baf33cf Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:13:17 +1300 Subject: [PATCH 191/360] desktop-file-utils: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/tools/misc/desktop-file-utils/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/desktop-file-utils/setup-hook.sh b/pkgs/tools/misc/desktop-file-utils/setup-hook.sh index 728070e345810..af0f6fb669ce4 100644 --- a/pkgs/tools/misc/desktop-file-utils/setup-hook.sh +++ b/pkgs/tools/misc/desktop-file-utils/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Remove mimeinfo cache mimeinfoPreFixupPhase() { rm -f $out/share/applications/mimeinfo.cache From 1877de95b3ec01f9427db405a9712118fb17537f Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:14:04 +1300 Subject: [PATCH 192/360] gnuplot: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh b/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh index 92ad2e97b5b45..e2c92071f542a 100644 --- a/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh +++ b/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash p=( $(fc-list : file | sed "s@/[^/]*: @@" | sort -u) ) IFS=: export GDFONTPATH="${GDFONTPATH}${GDFONTPATH:+:}${p[*]}" From 8ceb48eb3ff2be01b6055229891dc0cf6fa20c29 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:17:04 +1300 Subject: [PATCH 193/360] lzip: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/tools/compression/lzip/lzip-setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/compression/lzip/lzip-setup-hook.sh b/pkgs/tools/compression/lzip/lzip-setup-hook.sh index 092ad7737dd1d..c2df9a1335036 100644 --- a/pkgs/tools/compression/lzip/lzip-setup-hook.sh +++ b/pkgs/tools/compression/lzip/lzip-setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash lzipUnpackCmdHook() { [[ "$1" = *.tar.lz ]] && tar --lzip -xf "$1" } From 67c8fb2c1e6e3f328d3e3e84e8c95fd8aa3d44d0 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:17:25 +1300 Subject: [PATCH 194/360] apple-sdk: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh | 1 + pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh | 1 + .../darwin/apple-sdk/private-frameworks-setup-hook.sh | 1 + pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh | 1 + 4 files changed, 4 insertions(+) diff --git a/pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh index bbf9625e65577..8ef443998f418 100644 --- a/pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh +++ b/pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash linkSystemCoreFoundationFramework() { NIX_CFLAGS_COMPILE="-F@out@/Library/Frameworks${NIX_CFLAGS_COMPILE:+ }${NIX_CFLAGS_COMPILE-}" # gross! many symbols (such as _OBJC_CLASS_$_NSArray) are defined in system CF, but not diff --git a/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh index b0d5915fc1fcf..48c89ece2ef40 100644 --- a/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh +++ b/pkgs/os-specific/darwin/apple-sdk/framework-setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # On macOS, frameworks are linked to the system CoreFoundation but # dynamic libraries built with nix use a pure version of CF this # causes segfaults for binaries that depend on it at runtime. This diff --git a/pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh index a351c39de1307..b70a9c56f8f69 100644 --- a/pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh +++ b/pkgs/os-specific/darwin/apple-sdk/private-frameworks-setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addPrivateFrameworks() { flag="-F/System/Library/PrivateFrameworks" if [[ "${NIX_CFLAGS_COMPILE-}" != *$flag* ]]; then diff --git a/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh index 35cea773f98b5..1aabda7e661b1 100644 --- a/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh +++ b/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash noDeprecatedDeclarations() { # Security.framework has about 2000 deprecated constants, all of which the user will be # warned about at compilation time From 9323191f2411d5945b4f8991d7dbea0f84ffe70e Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:17:38 +1300 Subject: [PATCH 195/360] cygwin: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/stdenv/cygwin/all-buildinputs-as-runtimedep.sh | 1 + pkgs/stdenv/cygwin/rebase-i686.sh | 1 + pkgs/stdenv/cygwin/rebase-x86_64.sh | 1 + pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh | 1 + 4 files changed, 4 insertions(+) diff --git a/pkgs/stdenv/cygwin/all-buildinputs-as-runtimedep.sh b/pkgs/stdenv/cygwin/all-buildinputs-as-runtimedep.sh index 7cb6a58f180b2..9c9b4f95333cd 100644 --- a/pkgs/stdenv/cygwin/all-buildinputs-as-runtimedep.sh +++ b/pkgs/stdenv/cygwin/all-buildinputs-as-runtimedep.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # On cygwin, automatic runtime dependency detection does not work # because the binaries do not contain absolute references to store # locations (yet) diff --git a/pkgs/stdenv/cygwin/rebase-i686.sh b/pkgs/stdenv/cygwin/rebase-i686.sh index 6b8ec441ca7f9..a213ccf476a79 100644 --- a/pkgs/stdenv/cygwin/rebase-i686.sh +++ b/pkgs/stdenv/cygwin/rebase-i686.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash fixupOutputHooks+=(_cygwinFixAutoImageBase) _cygwinFixAutoImageBase() { diff --git a/pkgs/stdenv/cygwin/rebase-x86_64.sh b/pkgs/stdenv/cygwin/rebase-x86_64.sh index 6dccdc40c7221..87c7db282198e 100644 --- a/pkgs/stdenv/cygwin/rebase-x86_64.sh +++ b/pkgs/stdenv/cygwin/rebase-x86_64.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash fixupOutputHooks+=(_cygwinFixAutoImageBase) _cygwinFixAutoImageBase() { diff --git a/pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh b/pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh index d0da8c1b65c25..71290cd509720 100644 --- a/pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh +++ b/pkgs/stdenv/cygwin/wrap-exes-to-find-dlls.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash postFixupHooks+=(_cygwinWrapExesToFindDlls) _cygwinWrapExesToFindDlls() { From b5ade695ce9cda0932b4d793da35492fe6ebdf18 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:17:59 +1300 Subject: [PATCH 196/360] netbsd: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh | 1 + pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh | 1 + pkgs/os-specific/bsd/netbsd/install-setup-hook.sh | 1 + pkgs/os-specific/bsd/netbsd/setup-hook.sh | 1 + 4 files changed, 4 insertions(+) diff --git a/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh b/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh index 3c49337a937ce..2d772dbade849 100644 --- a/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh +++ b/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # See pkgs/build-support/setup-hooks/role.bash getHostRole diff --git a/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh b/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh index b6cb5aaca05b3..1458b214d4219 100644 --- a/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh +++ b/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # See pkgs/build-support/setup-hooks/role.bash getHostRole diff --git a/pkgs/os-specific/bsd/netbsd/install-setup-hook.sh b/pkgs/os-specific/bsd/netbsd/install-setup-hook.sh index 4bfd4d785fac4..397f942f89761 100644 --- a/pkgs/os-specific/bsd/netbsd/install-setup-hook.sh +++ b/pkgs/os-specific/bsd/netbsd/install-setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addNetBSDInstallMakeFlags() { export INSTALL_FILE="install -U -c" export INSTALL_DIR="install -U -d" diff --git a/pkgs/os-specific/bsd/netbsd/setup-hook.sh b/pkgs/os-specific/bsd/netbsd/setup-hook.sh index fa8b19e7d8ce4..52e53eb216a80 100644 --- a/pkgs/os-specific/bsd/netbsd/setup-hook.sh +++ b/pkgs/os-specific/bsd/netbsd/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash mergeNetBSDSourceDir() { # merge together all extra paths # there should be a better way to do this From ae1082997a9e1ea10e431d3e306142468d47433e Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:18:13 +1300 Subject: [PATCH 197/360] poetry2nix: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/tools/poetry2nix/poetry2nix/fetch-from-pypi.sh | 1 + pkgs/development/tools/poetry2nix/poetry2nix/hooks/fixup-hook.sh | 1 + .../tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh | 1 + .../poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh | 1 + .../tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh | 1 + 5 files changed, 5 insertions(+) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/fetch-from-pypi.sh b/pkgs/development/tools/poetry2nix/poetry2nix/fetch-from-pypi.sh index e56dee6849b2e..ebeaf4a6ab986 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/fetch-from-pypi.sh +++ b/pkgs/development/tools/poetry2nix/poetry2nix/fetch-from-pypi.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup set -euo pipefail diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/fixup-hook.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/fixup-hook.sh index fc539e4298c61..62ac198e1fff2 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/fixup-hook.sh +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/fixup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash poetry2nix-fixup-hook() { # Including tests in the output is a common mistake if [ -z "${dontFixupTests-}" ]; then diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh index a3ebe311d591e..36e1f79af7197 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Setup hook to use for pip projects echo "Sourcing pip-build-hook" diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh index b22a05900a05f..c6a8b4ec167d9 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash remove-path-dependencies-hook() { if ! test -f pyproject.toml; then return diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh index fca808a933bad..82f1f3d69c60c 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Setup hook to use in case a wheel is fetched echo "Sourcing wheel setup hook" From b8667ed1ed9f359fb5eb9b0df9c4d48d5b83bda2 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:18:27 +1300 Subject: [PATCH 198/360] xorg: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/servers/x11/xorg/builder.sh | 1 + pkgs/servers/x11/xorg/imake-setup-hook.sh | 1 + pkgs/servers/x11/xorg/imake.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh index 5a832cb14d539..38ef0e5eeebd3 100644 --- a/pkgs/servers/x11/xorg/builder.sh +++ b/pkgs/servers/x11/xorg/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # This is the builder for all X.org components. source $stdenv/setup diff --git a/pkgs/servers/x11/xorg/imake-setup-hook.sh b/pkgs/servers/x11/xorg/imake-setup-hook.sh index 351ffab34d0f0..1706f5c19d19d 100644 --- a/pkgs/servers/x11/xorg/imake-setup-hook.sh +++ b/pkgs/servers/x11/xorg/imake-setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash export IMAKECPP="@tradcpp@/bin/tradcpp" imakeConfigurePhase() { diff --git a/pkgs/servers/x11/xorg/imake.sh b/pkgs/servers/x11/xorg/imake.sh index 4ab5e2ae160ba..560b57f509efd 100644 --- a/pkgs/servers/x11/xorg/imake.sh +++ b/pkgs/servers/x11/xorg/imake.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash preInstall() { mkdir -p $out/lib/X11/config ln -s $xorgcffiles/lib/X11/config/* $out/lib/X11/config From c7ec48d860b7282e13f0fd9353cfa910d70d5f36 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:18:55 +1300 Subject: [PATCH 199/360] generic: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/stdenv/generic/builder.sh | 1 + pkgs/stdenv/generic/default-builder.sh | 1 + pkgs/stdenv/generic/setup.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index 2d8d784982a80..9b0bf6ebf2a3a 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash export PATH= for i in $initialPath; do if [ "$i" = / ]; then i=; fi diff --git a/pkgs/stdenv/generic/default-builder.sh b/pkgs/stdenv/generic/default-builder.sh index 273fc55c75523..aa219cf32bbfa 100644 --- a/pkgs/stdenv/generic/default-builder.sh +++ b/pkgs/stdenv/generic/default-builder.sh @@ -1,2 +1,3 @@ +# shellcheck shell=bash source $stdenv/setup genericBuild diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index b7645547abc99..791352db30ac9 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash set -eu set -o pipefail shopt -s inherit_errexit From d022b8f2e9bab59d9894fd5c49814b67b8c23b37 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:19:07 +1300 Subject: [PATCH 200/360] hylafaxplus: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/servers/hylafaxplus/post-install-check.sh | 1 + pkgs/servers/hylafaxplus/post-install.sh | 1 + pkgs/servers/hylafaxplus/post-patch.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/pkgs/servers/hylafaxplus/post-install-check.sh b/pkgs/servers/hylafaxplus/post-install-check.sh index 2850738edccce..792578c6eaf30 100644 --- a/pkgs/servers/hylafaxplus/post-install-check.sh +++ b/pkgs/servers/hylafaxplus/post-install-check.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # check if the package contains all the files needed for x in faxq faxquit hfaxd faxcron faxqclean faxgetty do diff --git a/pkgs/servers/hylafaxplus/post-install.sh b/pkgs/servers/hylafaxplus/post-install.sh index ddc7c3f85eda5..91b3e3625e58e 100644 --- a/pkgs/servers/hylafaxplus/post-install.sh +++ b/pkgs/servers/hylafaxplus/post-install.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Parts of the `install` make target don't # dare to set file modes (or owners), but put the # needed commands in a new file called `root.sh`. diff --git a/pkgs/servers/hylafaxplus/post-patch.sh b/pkgs/servers/hylafaxplus/post-patch.sh index 43ee91d2f62cc..96d9e470d448d 100644 --- a/pkgs/servers/hylafaxplus/post-patch.sh +++ b/pkgs/servers/hylafaxplus/post-patch.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Replace strange default value for the nobody account. if test -n "@maxuid@" then From aabd32588466808f27409f4b43f540b70ce8c273 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:19:20 +1300 Subject: [PATCH 201/360] simple: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/test/simple/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/test/simple/builder.sh b/pkgs/test/simple/builder.sh index 65f7e4c11ba1b..65709441b66ff 100644 --- a/pkgs/test/simple/builder.sh +++ b/pkgs/test/simple/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash set -x export NIX_DEBUG=1 From b82f2995ea51c36453e2bb8d93845600c025a37d Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:19:34 +1300 Subject: [PATCH 202/360] unrar-wrapper: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/tools/archivers/unrar-wrapper/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/archivers/unrar-wrapper/setup-hook.sh b/pkgs/tools/archivers/unrar-wrapper/setup-hook.sh index 41d6a5cd217bc..ee86d152597bd 100644 --- a/pkgs/tools/archivers/unrar-wrapper/setup-hook.sh +++ b/pkgs/tools/archivers/unrar-wrapper/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash unpackCmdHooks+=(_tryUnrar) _tryUnrar() { if ! [[ "$curSrc" =~ \.rar$ ]]; then return 1; fi From 7653fa9360017e19b9d781f0ac4095b69e3be334 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:19:49 +1300 Subject: [PATCH 203/360] unzip: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/tools/archivers/unzip/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/archivers/unzip/setup-hook.sh b/pkgs/tools/archivers/unzip/setup-hook.sh index 4055d2fab5127..aac6660439b0f 100644 --- a/pkgs/tools/archivers/unzip/setup-hook.sh +++ b/pkgs/tools/archivers/unzip/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash unpackCmdHooks+=(_tryUnzip) _tryUnzip() { if ! [[ "$curSrc" =~ \.zip$ ]]; then return 1; fi From 1693cd9cfbc8f741f82e13bc71246bd0e0d75dd5 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:19:58 +1300 Subject: [PATCH 204/360] unrar: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/tools/archivers/unrar/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/archivers/unrar/setup-hook.sh b/pkgs/tools/archivers/unrar/setup-hook.sh index 41d6a5cd217bc..ee86d152597bd 100644 --- a/pkgs/tools/archivers/unrar/setup-hook.sh +++ b/pkgs/tools/archivers/unrar/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash unpackCmdHooks+=(_tryUnrar) _tryUnrar() { if ! [[ "$curSrc" =~ \.rar$ ]]; then return 1; fi From bf774d5fa6f3b114a609a104653d3055ad9cff01 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:20:20 +1300 Subject: [PATCH 205/360] undmg: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/tools/archivers/undmg/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/archivers/undmg/setup-hook.sh b/pkgs/tools/archivers/undmg/setup-hook.sh index bc7ed76107ef8..1e2382bafb1ba 100644 --- a/pkgs/tools/archivers/undmg/setup-hook.sh +++ b/pkgs/tools/archivers/undmg/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash unpackCmdHooks+=(_tryUnpackDmg) _tryUnpackDmg() { if ! [[ "$curSrc" =~ \.dmg$ ]]; then return 1; fi From 0f330b6208b340bc85ec9be1af05452ddc679e92 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:20:30 +1300 Subject: [PATCH 206/360] p7zip: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/tools/archivers/p7zip/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/archivers/p7zip/setup-hook.sh b/pkgs/tools/archivers/p7zip/setup-hook.sh index 4dc88f07c0bda..844a87a9d95b8 100644 --- a/pkgs/tools/archivers/p7zip/setup-hook.sh +++ b/pkgs/tools/archivers/p7zip/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash unpackCmdHooks+=(_try7zip) _try7zip() { if ! [[ "$curSrc" =~ \.7z$ ]]; then return 1; fi From 9e8ee5aa8e9d218aab1aefe921c11292fcac6147 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:20:54 +1300 Subject: [PATCH 207/360] python/hooks: Indicate shell to ShellCheck ShellCheck SC2148. --- .../development/interpreters/python/hooks/conda-install-hook.sh | 1 + pkgs/development/interpreters/python/hooks/conda-unpack-hook.sh | 1 + pkgs/development/interpreters/python/hooks/egg-build-hook.sh | 1 + pkgs/development/interpreters/python/hooks/egg-install-hook.sh | 1 + pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh | 1 + pkgs/development/interpreters/python/hooks/flit-build-hook.sh | 1 + pkgs/development/interpreters/python/hooks/pip-build-hook.sh | 1 + pkgs/development/interpreters/python/hooks/pip-install-hook.sh | 1 + pkgs/development/interpreters/python/hooks/pytest-check-hook.sh | 1 + .../interpreters/python/hooks/python-catch-conflicts-hook.sh | 1 + .../interpreters/python/hooks/python-imports-check-hook.sh | 1 + .../interpreters/python/hooks/python-namespaces-hook.sh | 2 +- .../interpreters/python/hooks/python-recompile-bytecode-hook.sh | 1 + .../python/hooks/python-remove-bin-bytecode-hook.sh | 1 + .../interpreters/python/hooks/python-remove-tests-dir-hook.sh | 1 + .../interpreters/python/hooks/setuptools-build-hook.sh | 1 + .../interpreters/python/hooks/setuptools-check-hook.sh | 1 + pkgs/development/interpreters/python/hooks/venv-shell-hook.sh | 1 + pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh | 1 + 19 files changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/hooks/conda-install-hook.sh b/pkgs/development/interpreters/python/hooks/conda-install-hook.sh index af9ed60a038d1..0b69289317955 100644 --- a/pkgs/development/interpreters/python/hooks/conda-install-hook.sh +++ b/pkgs/development/interpreters/python/hooks/conda-install-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Setup hook to use in case a conda binary package is installed echo "Sourcing conda install hook" diff --git a/pkgs/development/interpreters/python/hooks/conda-unpack-hook.sh b/pkgs/development/interpreters/python/hooks/conda-unpack-hook.sh index 6204c13b72219..eaf9d558c310d 100644 --- a/pkgs/development/interpreters/python/hooks/conda-unpack-hook.sh +++ b/pkgs/development/interpreters/python/hooks/conda-unpack-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Setup hook to use in case a conda binary package is fetched echo "Sourcing conda unpack hook" diff --git a/pkgs/development/interpreters/python/hooks/egg-build-hook.sh b/pkgs/development/interpreters/python/hooks/egg-build-hook.sh index d5abc8d55e5af..906c6bccdf1ee 100644 --- a/pkgs/development/interpreters/python/hooks/egg-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/egg-build-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Setup hook to use for eggs echo "Sourcing egg-build-hook" diff --git a/pkgs/development/interpreters/python/hooks/egg-install-hook.sh b/pkgs/development/interpreters/python/hooks/egg-install-hook.sh index ae894fb1bde4b..b93ee930f50e4 100644 --- a/pkgs/development/interpreters/python/hooks/egg-install-hook.sh +++ b/pkgs/development/interpreters/python/hooks/egg-install-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Setup hook for eggs echo "Sourcing egg-install-hook" diff --git a/pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh b/pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh index c8ed3dee83bae..6241f4655a35a 100644 --- a/pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh +++ b/pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Setup hook to use in case an egg is fetched echo "Sourcing egg setup hook" diff --git a/pkgs/development/interpreters/python/hooks/flit-build-hook.sh b/pkgs/development/interpreters/python/hooks/flit-build-hook.sh index 45893aae00f4e..48dc944d83398 100644 --- a/pkgs/development/interpreters/python/hooks/flit-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/flit-build-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Setup hook for flit echo "Sourcing flit-build-hook" diff --git a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh index 745f02e8c9bc3..5a6d3c36ba04a 100644 --- a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Setup hook to use for pip projects echo "Sourcing pip-build-hook" diff --git a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh index a4f08b8b14cbd..6710dffeb9d11 100644 --- a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Setup hook for pip. echo "Sourcing pip-install-hook" diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh index 0f708f888292b..ea8c7cf6ede17 100644 --- a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Setup hook for pytest echo "Sourcing pytest-check-hook" diff --git a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh index 374a2eddb407e..29a600d9fa6e3 100644 --- a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Setup hook for detecting conflicts in Python packages echo "Sourcing python-catch-conflicts-hook.sh" diff --git a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh index f8ca84cd573ab..a79e5f8c96c6e 100644 --- a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Setup hook for checking whether Python imports succeed echo "Sourcing python-imports-check-hook.sh" diff --git a/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh b/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh index 15d2bd0eb34c5..ec9f1cd9919dc 100644 --- a/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Clean up __init__.py's found in namespace directories echo "Sourcing python-namespaces-hook" @@ -38,4 +39,3 @@ pythonNamespacesHook() { if [ -z "${dontUsePythonNamespacesHook-}" -a -n "${pythonNamespaces-}" ]; then postFixupHooks+=(pythonNamespacesHook) fi - diff --git a/pkgs/development/interpreters/python/hooks/python-recompile-bytecode-hook.sh b/pkgs/development/interpreters/python/hooks/python-recompile-bytecode-hook.sh index 649d0c17ea0c8..0a09070592b21 100644 --- a/pkgs/development/interpreters/python/hooks/python-recompile-bytecode-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-recompile-bytecode-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Setup hook for recompiling bytecode. # https://github.com/NixOS/nixpkgs/issues/81441 echo "Sourcing python-recompile-bytecode-hook.sh" diff --git a/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh b/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh index 1180694294dbe..ad4c19bfc0f59 100644 --- a/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Setup hook for removing bytecode from the bin folder echo "Sourcing python-remove-bin-bytecode-hook.sh" diff --git a/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh b/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh index ad9e3c07cf244..839f3d0624951 100644 --- a/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Clean up top-level tests directory in site-package installation. echo "Sourcing python-remove-tests-dir-hook" diff --git a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh index cc03774492516..11afdfa780ff8 100644 --- a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Setup hook for setuptools. echo "Sourcing setuptools-build-hook" diff --git a/pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh index 88b7b11931b02..b88899201df70 100644 --- a/pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Setup hook for setuptools. echo "Sourcing setuptools-check-hook" diff --git a/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh b/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh index 1fcc0bbd4b130..729d656d7764d 100644 --- a/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh +++ b/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash venvShellHook() { echo "Executing venvHook" runHook preShellHook diff --git a/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh b/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh index fca808a933bad..82f1f3d69c60c 100644 --- a/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh +++ b/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Setup hook to use in case a wheel is fetched echo "Sourcing wheel setup hook" From 497546aee35524fdcca8ec8ea6b49df3c9683806 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:21:33 +1300 Subject: [PATCH 208/360] qt-5/hooks: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/qt-5/hooks/fix-qmake-libtool.sh | 1 + pkgs/development/libraries/qt-5/hooks/fix-qt-builtin-paths.sh | 1 + pkgs/development/libraries/qt-5/hooks/fix-qt-module-paths.sh | 1 + pkgs/development/libraries/qt-5/hooks/move-qt-dev-tools.sh | 1 + pkgs/development/libraries/qt-5/hooks/qmake-hook.sh | 1 + pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh | 1 + pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh | 1 + pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh | 1 + 8 files changed, 8 insertions(+) diff --git a/pkgs/development/libraries/qt-5/hooks/fix-qmake-libtool.sh b/pkgs/development/libraries/qt-5/hooks/fix-qmake-libtool.sh index 6aaeda052d706..8b2e93c364b4c 100644 --- a/pkgs/development/libraries/qt-5/hooks/fix-qmake-libtool.sh +++ b/pkgs/development/libraries/qt-5/hooks/fix-qmake-libtool.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Fix libtool libraries generated by qmake. # qmake started inserting filenames of shared objects instead of the appropriate # linker flags. fixQmakeLibtool searches for broken libtool libraries and diff --git a/pkgs/development/libraries/qt-5/hooks/fix-qt-builtin-paths.sh b/pkgs/development/libraries/qt-5/hooks/fix-qt-builtin-paths.sh index 4ca11a223de25..27327b101eae9 100644 --- a/pkgs/development/libraries/qt-5/hooks/fix-qt-builtin-paths.sh +++ b/pkgs/development/libraries/qt-5/hooks/fix-qt-builtin-paths.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # fixQtBuiltinPaths # # Usage: fixQtBuiltinPaths _dir_ _pattern_ diff --git a/pkgs/development/libraries/qt-5/hooks/fix-qt-module-paths.sh b/pkgs/development/libraries/qt-5/hooks/fix-qt-module-paths.sh index 33682f6f3c695..4dcd46492d10a 100644 --- a/pkgs/development/libraries/qt-5/hooks/fix-qt-module-paths.sh +++ b/pkgs/development/libraries/qt-5/hooks/fix-qt-module-paths.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # fixQtModulePaths # # Usage: fixQtModulePaths _dir_ diff --git a/pkgs/development/libraries/qt-5/hooks/move-qt-dev-tools.sh b/pkgs/development/libraries/qt-5/hooks/move-qt-dev-tools.sh index 85489c85105bc..e12b958a5f5ab 100644 --- a/pkgs/development/libraries/qt-5/hooks/move-qt-dev-tools.sh +++ b/pkgs/development/libraries/qt-5/hooks/move-qt-dev-tools.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash updateToolPath() { local tool="$1" local target="$2" diff --git a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh b/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh index 741225a5aa810..093f2d1556ba0 100644 --- a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash . @fix_qmake_libtool@ qmakeFlags=( ${qmakeFlags-} ) diff --git a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh index 1b57d676e1fc5..0432c8c4ad9f4 100644 --- a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash if [[ -n "${__nix_qtbase-}" ]]; then # Throw an error if a different version of Qt was already set up. if [[ "$__nix_qtbase" != "@dev@" ]]; then diff --git a/pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh b/pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh index c320a79744711..dea1c915558e9 100644 --- a/pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh @@ -1 +1,2 @@ +# shellcheck shell=bash qmakeFlags+=( "QMAKE_LRELEASE=@dev@/bin/lrelease" ) diff --git a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh index c085cdaca52ea..222b23fdcf930 100644 --- a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash if [[ -z "${__nix_wrapQtAppsHook-}" ]]; then __nix_wrapQtAppsHook=1 # Don't run this hook more than once. From e3ab1c4f1ae51c2fd9b3b6c8bec7b89a1065b009 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:21:46 +1300 Subject: [PATCH 209/360] apple-sdk: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/os-specific/darwin/apple-sdk-11.0/cf-setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/cf-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk-11.0/cf-setup-hook.sh index 3b08c51d196e4..113483477b57e 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/cf-setup-hook.sh +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/cf-setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash forceLinkCoreFoundationFramework() { NIX_CFLAGS_COMPILE="-F@out@/Library/Frameworks${NIX_CFLAGS_COMPILE:+ }${NIX_CFLAGS_COMPILE-}" NIX_LDFLAGS+=" @out@/Library/Frameworks/CoreFoundation.framework/CoreFoundation" From 050503f0decc87239a4ddbb32a7ae202541065ea Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:22:23 +1300 Subject: [PATCH 210/360] maintainers/scripts: Indicate shell to ShellCheck ShellCheck SC2148. --- maintainers/scripts/patchelf-hints.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/scripts/patchelf-hints.sh b/maintainers/scripts/patchelf-hints.sh index 5fdfc15dc2320..86a8056d5b422 100755 --- a/maintainers/scripts/patchelf-hints.sh +++ b/maintainers/scripts/patchelf-hints.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash usage() { echo " From 872b8a31652813a26dbd9a93845cd988ca19cf5d Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:23:06 +1300 Subject: [PATCH 211/360] darwin: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/stdenv/darwin/portable-libsystem.sh | 1 + pkgs/stdenv/darwin/unpack-bootstrap-tools-aarch64.sh | 1 + pkgs/stdenv/darwin/unpack-bootstrap-tools.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/pkgs/stdenv/darwin/portable-libsystem.sh b/pkgs/stdenv/darwin/portable-libsystem.sh index f50ccc8d32eea..27e07e6860205 100644 --- a/pkgs/stdenv/darwin/portable-libsystem.sh +++ b/pkgs/stdenv/darwin/portable-libsystem.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Make /nix/store/...-libSystem “portable” for static built binaries. # This just rewrites everything in $1/bin to use the # /usr/lib/libSystem.B.dylib that is provided on every macOS system. diff --git a/pkgs/stdenv/darwin/unpack-bootstrap-tools-aarch64.sh b/pkgs/stdenv/darwin/unpack-bootstrap-tools-aarch64.sh index 63b72972d7178..87f947aede3b9 100644 --- a/pkgs/stdenv/darwin/unpack-bootstrap-tools-aarch64.sh +++ b/pkgs/stdenv/darwin/unpack-bootstrap-tools-aarch64.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash set -euo pipefail # Unpack the bootstrap tools tarball. diff --git a/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh b/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh index 37beeaf28f94b..8fb2f121b3e73 100644 --- a/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash set -e # Unpack the bootstrap tools tarball. From 4b2015a56d41242d48c7965f83751f86ba690379 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:23:46 +1300 Subject: [PATCH 212/360] nixos/lib: Indicate shell to ShellCheck ShellCheck SC2148. --- nixos/lib/make-iso9660-image.sh | 1 + nixos/lib/make-system-tarball.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh index 4740b05f95571..d0a94466a31b3 100644 --- a/nixos/lib/make-iso9660-image.sh +++ b/nixos/lib/make-iso9660-image.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup sources_=($sources) diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh index 1a0017a1799a4..380ae52a78331 100644 --- a/nixos/lib/make-system-tarball.sh +++ b/nixos/lib/make-system-tarball.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup sources_=($sources) From 671896c641e6bcea6e9fba8471cc253906ce5caa Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:32 +1300 Subject: [PATCH 213/360] kde: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/applications/kde/fetch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index f4eb1b85965dc..d3d79f62dddf7 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1,2 @@ +# shellcheck shell=bash WGET_ARGS=( https://download.kde.org/stable/release-service/21.08.3/src -A '*.tar.xz' ) From 28e904054f97aedaae32854173f646abbe19175a Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:32 +1300 Subject: [PATCH 214/360] plasma-mobile: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/applications/plasma-mobile/fetch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/plasma-mobile/fetch.sh b/pkgs/applications/plasma-mobile/fetch.sh index 14995aeb2b7f9..33b0c316ae27a 100644 --- a/pkgs/applications/plasma-mobile/fetch.sh +++ b/pkgs/applications/plasma-mobile/fetch.sh @@ -1 +1,2 @@ +# shellcheck shell=bash WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/21.08/ -A '*.tar.xz' ) From 717aade41c16001cd47f83de6c70dd0c04fec9fc Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:32 +1300 Subject: [PATCH 215/360] add-opengl-runpath: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/add-opengl-runpath/setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/add-opengl-runpath/setup-hook.sh b/pkgs/build-support/add-opengl-runpath/setup-hook.sh index e556e7ead2a78..b690f458e0f5b 100644 --- a/pkgs/build-support/add-opengl-runpath/setup-hook.sh +++ b/pkgs/build-support/add-opengl-runpath/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found. # This is needed to not rely on LD_LIBRARY_PATH which does not work with setuid # executables. Fixes https://github.com/NixOS/nixpkgs/issues/22760. It must be run @@ -26,4 +27,3 @@ addOpenGLRunpath() { patchelf --set-rpath "@driverLink@/lib:$origRpath" ${forceRpath:+--force-rpath} "$file" done } - From 3e2028a5dad4566cafb12fd5e006607bc0243434 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:32 +1300 Subject: [PATCH 216/360] bintools-wrapper: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh | 1 + pkgs/build-support/bintools-wrapper/add-flags.sh | 1 + pkgs/build-support/bintools-wrapper/add-hardening.sh | 1 + pkgs/build-support/bintools-wrapper/setup-hook.sh | 1 + 4 files changed, 4 insertions(+) diff --git a/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh b/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh index 75d9484846a8c..624c9949b7c09 100644 --- a/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh +++ b/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Unconditionally adding in platform version flags will result in warnings that # will be treated as errors by some packages. Add any missing flags here. diff --git a/pkgs/build-support/bintools-wrapper/add-flags.sh b/pkgs/build-support/bintools-wrapper/add-flags.sh index 3b94daba65d77..94ac1b66bf795 100644 --- a/pkgs/build-support/bintools-wrapper/add-flags.sh +++ b/pkgs/build-support/bintools-wrapper/add-flags.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # See cc-wrapper for comments. var_templates_list=( NIX_IGNORE_LD_THROUGH_GCC diff --git a/pkgs/build-support/bintools-wrapper/add-hardening.sh b/pkgs/build-support/bintools-wrapper/add-hardening.sh index 0a2b2509a8265..d9c5ec7b91065 100644 --- a/pkgs/build-support/bintools-wrapper/add-hardening.sh +++ b/pkgs/build-support/bintools-wrapper/add-hardening.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash declare -a hardeningLDFlags=() declare -A hardeningEnableMap=() diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh index 7e9547b96c259..ace22f3b0e2ad 100644 --- a/pkgs/build-support/bintools-wrapper/setup-hook.sh +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Binutils Wrapper hygiene # # See comments in cc-wrapper's setup hook. This works exactly the same way. From d0b9f1e383514582767f32d09bb1575397677313 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:32 +1300 Subject: [PATCH 217/360] cc-wrapper: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/cc-wrapper/add-flags.sh | 1 + pkgs/build-support/cc-wrapper/add-hardening.sh | 1 + pkgs/build-support/cc-wrapper/fortran-hook.sh | 1 + pkgs/build-support/cc-wrapper/setup-hook.sh | 1 + 4 files changed, 4 insertions(+) diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index a6e991914e6b6..dbfdad649a1af 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # N.B. It may be a surprise that the derivation-specific variables are exported, # since this is just sourced by the wrapped binaries---the end consumers. This # is because one wrapper binary may invoke another (e.g. cc invoking ld). In diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index e5d296f6c9c52..f5e760b65e8d5 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash declare -a hardeningCFlags=() declare -A hardeningEnableMap=() diff --git a/pkgs/build-support/cc-wrapper/fortran-hook.sh b/pkgs/build-support/cc-wrapper/fortran-hook.sh index d72f314c01ce6..702f9deab4344 100644 --- a/pkgs/build-support/cc-wrapper/fortran-hook.sh +++ b/pkgs/build-support/cc-wrapper/fortran-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash getTargetRole getTargetRoleWrapper diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index 6a913cc4eac72..5c96010bdace4 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # CC Wrapper hygiene # # For at least cross compilation, we need to depend on multiple cc-wrappers at From 8347ee9a06e3b9b4ebe44754a4c18aa6f0661b2d Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:33 +1300 Subject: [PATCH 218/360] emacs: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/emacs/emacs-funcs.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/emacs/emacs-funcs.sh b/pkgs/build-support/emacs/emacs-funcs.sh index e1e6a3b622087..8eb997907f96f 100644 --- a/pkgs/build-support/emacs/emacs-funcs.sh +++ b/pkgs/build-support/emacs/emacs-funcs.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addToEmacsLoadPath() { local lispDir="$1" if [[ -d $lispDir && ${EMACSLOADPATH-} != *"$lispDir":* ]] ; then From fce5e4d922fdc03598912d94a804235adebd3ad8 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:33 +1300 Subject: [PATCH 219/360] fetchbzr: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/fetchbzr/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/build-support/fetchbzr/builder.sh index e424fd92d51e5..32c9607942a33 100644 --- a/pkgs/build-support/fetchbzr/builder.sh +++ b/pkgs/build-support/fetchbzr/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source "$stdenv/setup" header "exporting \`$url' (revision $rev) into \`$out'" From b84e228ae08d23832150ae090ca8fff24ebf8d3b Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:33 +1300 Subject: [PATCH 220/360] fetchcvs: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/fetchcvs/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchcvs/builder.sh b/pkgs/build-support/fetchcvs/builder.sh index fe1019aafc2f5..8ee9b8ecfbd3a 100644 --- a/pkgs/build-support/fetchcvs/builder.sh +++ b/pkgs/build-support/fetchcvs/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup (echo "#!$SHELL"; \ From 2a051cd9b62c059cb9b73a8ea66a10e11ed46c88 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:33 +1300 Subject: [PATCH 221/360] fetchdarcs: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/fetchdarcs/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchdarcs/builder.sh b/pkgs/build-support/fetchdarcs/builder.sh index 301deb98307ff..54168d0d403c8 100644 --- a/pkgs/build-support/fetchdarcs/builder.sh +++ b/pkgs/build-support/fetchdarcs/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup tagtext="" From 7cf0b0b334ad25890af1ab4ee7d7447457c4d952 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:33 +1300 Subject: [PATCH 222/360] fetchdocker: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/fetchdocker/fetchdocker-builder.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh index 7443591e6569b..0e7e483045980 100644 --- a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh +++ b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source "${stdenv}/setup" header "exporting ${repository}/${imageName} (tag: ${tag}) into ${out}" mkdir -p "${out}" @@ -8,7 +9,7 @@ cat < "${out}/compositeImage.sh" # Create a tar archive of a docker image's layers, docker image config # json, manifest.json, and repositories json; this streams directly to # stdout and is intended to be used in concert with docker load, i.e: -# +# # ${out}/compositeImage.sh | docker load # The first character follow the 's' command for sed becomes the From dc5dde89ce340667fcf91b01d1eeaec4264efe49 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:33 +1300 Subject: [PATCH 223/360] fetchfossil: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/fetchfossil/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchfossil/builder.sh b/pkgs/build-support/fetchfossil/builder.sh index 5f08aca424fed..587c8cb3f8323 100644 --- a/pkgs/build-support/fetchfossil/builder.sh +++ b/pkgs/build-support/fetchfossil/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup header "Cloning Fossil $url [$rev] into $out" From 2b7a1e9af90b0a8b69a0b7fc453aee5d4336c703 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:33 +1300 Subject: [PATCH 224/360] fetchgit: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/fetchgit/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 0047a335c76c6..159ed0a3c8926 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # tested so far with: # - no revision specified and remote has a HEAD which is used # - revision specified and remote has a HEAD From b05132fb4e9957f5613e1cfd13f2ed1d0b64c0dc Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:33 +1300 Subject: [PATCH 225/360] fetchhg: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/fetchhg/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchhg/builder.sh b/pkgs/build-support/fetchhg/builder.sh index 847f18fa59759..19922de458b00 100644 --- a/pkgs/build-support/fetchhg/builder.sh +++ b/pkgs/build-support/fetchhg/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup header "getting $url${rev:+ ($rev)} into $out" From 136a49efdada876e90f601c040c91a053c00a5aa Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:33 +1300 Subject: [PATCH 226/360] fetchipfs: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/fetchipfs/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchipfs/builder.sh b/pkgs/build-support/fetchipfs/builder.sh index 7a6a517566f5e..cda2ab5152b2e 100644 --- a/pkgs/build-support/fetchipfs/builder.sh +++ b/pkgs/build-support/fetchipfs/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup # Curl flags to handle redirects, not use EPSV, handle cookies for From 0438ec7f8aaafffdee0e14b10bb8f8d59625e251 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:33 +1300 Subject: [PATCH 227/360] fetchmtn: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/fetchmtn/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchmtn/builder.sh b/pkgs/build-support/fetchmtn/builder.sh index 73eff9c272529..11dbf9125d078 100644 --- a/pkgs/build-support/fetchmtn/builder.sh +++ b/pkgs/build-support/fetchmtn/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup set -x From 34b9cf8fd5005e5c27fe64b0a7649de2e0c739ee Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:34 +1300 Subject: [PATCH 228/360] fetchsvn: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/fetchsvn/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index ed3e65f076959..f87cffcabfe93 100644 --- a/pkgs/build-support/fetchsvn/builder.sh +++ b/pkgs/build-support/fetchsvn/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup header "exporting $url (r$rev) into $out" From 259886a2e1a9eeebf06a89a7c9450956ab8a262a Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:34 +1300 Subject: [PATCH 229/360] fetchsvnssh: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/fetchsvnssh/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchsvnssh/builder.sh b/pkgs/build-support/fetchsvnssh/builder.sh index d9c6dc7da31a6..e3e0f3d1c5d17 100644 --- a/pkgs/build-support/fetchsvnssh/builder.sh +++ b/pkgs/build-support/fetchsvnssh/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup header "exporting $url (r$rev) into $out" From 2382c029ef0384ad4b79a0116744568796564140 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:34 +1300 Subject: [PATCH 230/360] fetchurl: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/fetchurl/builder.sh | 1 + pkgs/build-support/fetchurl/write-mirror-list.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index 5b04a702aff43..418b1added950 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup source $mirrorsFile diff --git a/pkgs/build-support/fetchurl/write-mirror-list.sh b/pkgs/build-support/fetchurl/write-mirror-list.sh index 2dabd2e722be8..7b12b7f33aaf3 100644 --- a/pkgs/build-support/fetchurl/write-mirror-list.sh +++ b/pkgs/build-support/fetchurl/write-mirror-list.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup # !!! this is kinda hacky. From 7a3594f0817b096d1b1b542d4641734d319e0b02 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:34 +1300 Subject: [PATCH 231/360] java: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/java/canonicalize-jar.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/java/canonicalize-jar.sh b/pkgs/build-support/java/canonicalize-jar.sh index af010bcd2b26c..c1fa08f024606 100644 --- a/pkgs/build-support/java/canonicalize-jar.sh +++ b/pkgs/build-support/java/canonicalize-jar.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Canonicalize the manifest & repack with deterministic timestamps. canonicalizeJar() { local input='' outer='' From d9f47cb97aa1aa0870a5668ecabd0f16a2dd6fb1 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:34 +1300 Subject: [PATCH 232/360] kernel: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/kernel/make-initrd.sh | 1 + pkgs/build-support/kernel/modules-closure.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index 70884741af3a6..4c2fccf1d017a 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup set -o pipefail diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index 3b3a38ea1d33e..01369b421b110 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup # When no modules are built, the $out/lib/modules directory will not From ef5dbd146c2634fd0f84d7f5dc61a6b1cfeeaf43 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:34 +1300 Subject: [PATCH 233/360] make-symlinks: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/make-symlinks/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/make-symlinks/builder.sh b/pkgs/build-support/make-symlinks/builder.sh index 70f1d2ca1b25a..0ba176c2a76b5 100644 --- a/pkgs/build-support/make-symlinks/builder.sh +++ b/pkgs/build-support/make-symlinks/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup mkdir $out From dbcef56e249be27a59fb81d941fdd68566687c39 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:34 +1300 Subject: [PATCH 234/360] mono-dll-fixer: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/mono-dll-fixer/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/mono-dll-fixer/builder.sh b/pkgs/build-support/mono-dll-fixer/builder.sh index 67abc465a9bdd..e720e5b9b5e6e 100644 --- a/pkgs/build-support/mono-dll-fixer/builder.sh +++ b/pkgs/build-support/mono-dll-fixer/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup substitute $dllFixer $out --subst-var-by perl $perl/bin/perl From 334521ab59a518f4660c16d4c627f08500ed25ee Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:34 +1300 Subject: [PATCH 235/360] nuke-references: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/nuke-references/darwin-sign-fixup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/nuke-references/darwin-sign-fixup.sh b/pkgs/build-support/nuke-references/darwin-sign-fixup.sh index 940c18e5a6271..e46faf84b52bc 100644 --- a/pkgs/build-support/nuke-references/darwin-sign-fixup.sh +++ b/pkgs/build-support/nuke-references/darwin-sign-fixup.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Fixup hook for nukeReferences, not stdenv source @signingUtils@ From a393dca0fa29059b4c4dbab824d30374f0ae69d3 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:34 +1300 Subject: [PATCH 236/360] pkg-config-wrapper: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/pkg-config-wrapper/add-flags.sh | 1 + pkgs/build-support/pkg-config-wrapper/setup-hook.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/build-support/pkg-config-wrapper/add-flags.sh b/pkgs/build-support/pkg-config-wrapper/add-flags.sh index 90aee712be63d..bcca3e5ccd23e 100644 --- a/pkgs/build-support/pkg-config-wrapper/add-flags.sh +++ b/pkgs/build-support/pkg-config-wrapper/add-flags.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # See cc-wrapper for comments. var_templates_list=( PKG_CONFIG_PATH diff --git a/pkgs/build-support/pkg-config-wrapper/setup-hook.sh b/pkgs/build-support/pkg-config-wrapper/setup-hook.sh index 34f1a999a82ee..f29a02c3cb4f7 100644 --- a/pkgs/build-support/pkg-config-wrapper/setup-hook.sh +++ b/pkgs/build-support/pkg-config-wrapper/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # pkg-config Wrapper hygiene # # See comments in cc-wrapper's setup hook. This works exactly the same way. From b866a4b53fe96ccaa4a5fb371744eef1c3f136d2 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:35 +1300 Subject: [PATCH 237/360] release: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/release/functions.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/release/functions.sh b/pkgs/build-support/release/functions.sh index 0c4b81edf822e..1df5c7c23c943 100644 --- a/pkgs/build-support/release/functions.sh +++ b/pkgs/build-support/release/functions.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash findTarball() { local suffix i if [ -d "$1/tarballs/" ]; then From 426961386f2a122afb6ccf7fd1091d3429bd417f Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:35 +1300 Subject: [PATCH 238/360] remove-references-to: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/remove-references-to/darwin-sign-fixup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/remove-references-to/darwin-sign-fixup.sh b/pkgs/build-support/remove-references-to/darwin-sign-fixup.sh index 940c18e5a6271..e46faf84b52bc 100644 --- a/pkgs/build-support/remove-references-to/darwin-sign-fixup.sh +++ b/pkgs/build-support/remove-references-to/darwin-sign-fixup.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Fixup hook for nukeReferences, not stdenv source @signingUtils@ From d60a285745aae746c654c842c5e7896b97e3648c Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:35 +1300 Subject: [PATCH 239/360] substitute: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/substitute/substitute-all.sh | 1 + pkgs/build-support/substitute/substitute.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/substitute/substitute-all.sh b/pkgs/build-support/substitute/substitute-all.sh index ec220481fcc09..1ee74fa4fa81d 100644 --- a/pkgs/build-support/substitute/substitute-all.sh +++ b/pkgs/build-support/substitute/substitute-all.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup eval "$preInstall" diff --git a/pkgs/build-support/substitute/substitute.sh b/pkgs/build-support/substitute/substitute.sh index dbac275a80ede..dc9dfdeeac452 100644 --- a/pkgs/build-support/substitute/substitute.sh +++ b/pkgs/build-support/substitute/substitute.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup args= @@ -15,4 +16,3 @@ if test -n "$isExecutable"; then fi eval "$postInstall" - From e81c4d7c98a852edf52825a2e8caba8871e48777 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:35 +1300 Subject: [PATCH 240/360] upstream-updater: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/upstream-updater/snippets.sh | 1 + .../upstream-updater/update-walker-service-specific.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/build-support/upstream-updater/snippets.sh b/pkgs/build-support/upstream-updater/snippets.sh index 2c06696c928f4..8b290270cd9fe 100644 --- a/pkgs/build-support/upstream-updater/snippets.sh +++ b/pkgs/build-support/upstream-updater/snippets.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # sed scripts #http://sourceforge.net/projects/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz/download diff --git a/pkgs/build-support/upstream-updater/update-walker-service-specific.sh b/pkgs/build-support/upstream-updater/update-walker-service-specific.sh index fe439c5d11e39..332b3e7feccc2 100644 --- a/pkgs/build-support/upstream-updater/update-walker-service-specific.sh +++ b/pkgs/build-support/upstream-updater/update-walker-service-specific.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash SF_redirect () { redirect process 'http://[a-z]+[.]dl[.]sourceforge[.]net/' 'mirror://sourceforge/' From 38fb6ae48f87a283231f3d42276731f8f67c912c Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:35 +1300 Subject: [PATCH 241/360] plasma-5: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/desktops/plasma-5/fetch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 91031ac618fb8..d6d187bb60326 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1,2 @@ +# shellcheck shell=bash WGET_ARGS=( https://download.kde.org/stable/plasma/5.23.3/ -A '*.tar.xz' ) From fd0d10683726bac7d3e0c88f4acedd9d49e1b702 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:35 +1300 Subject: [PATCH 242/360] xfce: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/desktops/xfce/automakeAddFlags.sh | 1 + pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/desktops/xfce/automakeAddFlags.sh b/pkgs/desktops/xfce/automakeAddFlags.sh index 92d5659d05ca7..a49eaa7775f46 100644 --- a/pkgs/desktops/xfce/automakeAddFlags.sh +++ b/pkgs/desktops/xfce/automakeAddFlags.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash automakeAddFlags() { local file="$1" local target="$2" diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh b/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh index 3abf3172ea66c..b9bfcad5d43ed 100644 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash xdtEnvHook() { addToSearchPath ACLOCAL_PATH $1/share/aclocal } From 67126d534c00f95b5865f8f36de09715b72a5469 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:35 +1300 Subject: [PATCH 243/360] haskell-modules: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/haskell-modules/stack-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/stack-hook.sh b/pkgs/development/haskell-modules/stack-hook.sh index 44c184a5624ac..3503008636cf1 100644 --- a/pkgs/development/haskell-modules/stack-hook.sh +++ b/pkgs/development/haskell-modules/stack-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addStackArgs () { if [ -n "$(echo $1/lib/lib*)" ]; then STACK_IN_NIX_EXTRA_ARGS+=" --extra-lib-dirs=$1/lib" From 1877550f7963511565424598659b7dc4e5f294d3 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:35 +1300 Subject: [PATCH 244/360] pure-modules: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/pure-modules/generic-setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/pure-modules/generic-setup-hook.sh b/pkgs/development/pure-modules/generic-setup-hook.sh index efaa2211ae66c..0d47c2dc2ee8f 100644 --- a/pkgs/development/pure-modules/generic-setup-hook.sh +++ b/pkgs/development/pure-modules/generic-setup-hook.sh @@ -1,2 +1,3 @@ +# shellcheck shell=bash addToSearchPath PURE_INCLUDE $1/lib/pure addToSearchPath PURE_LIBRARY $1/lib/pure From 71bb072df45947267a0d8f2acc12ea2c893afdf7 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:35 +1300 Subject: [PATCH 245/360] openra: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/games/openra/mkdirp.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/openra/mkdirp.sh b/pkgs/games/openra/mkdirp.sh index 7b2cf0b89c0e6..60e1ae409ca3d 100644 --- a/pkgs/games/openra/mkdirp.sh +++ b/pkgs/games/openra/mkdirp.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash mkdirp() { mkdir -p "$@" echo "$@" From 5d58b9203375e6c9997fce8cce7ee61a1ee99335 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:35 +1300 Subject: [PATCH 246/360] steam: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/games/steam/build-wrapped.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/steam/build-wrapped.sh b/pkgs/games/steam/build-wrapped.sh index ddf974671a038..96669dceae291 100644 --- a/pkgs/games/steam/build-wrapped.sh +++ b/pkgs/games/steam/build-wrapped.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup outp=$out/lib/steam-runtime From 3d792dad6e79a01adf7ba2ace877500635683ae2 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:36 +1300 Subject: [PATCH 247/360] vim-plugins: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/misc/vim-plugins/vim-gen-doc-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh b/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh index d5f0a00ebcc28..0cc4e97919d4c 100644 --- a/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh +++ b/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash echo "Sourcing vim-gen-doc-hook" # the doc folder is copied via the copy_directories entry of the rockspec @@ -27,4 +28,3 @@ vimPluginGenTags() { } preFixupHooks+=(vimPluginGenTags) - From d58f0f77395dbc1716c28c1181eb1bcf926c8369 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:36 +1300 Subject: [PATCH 248/360] bsd: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/os-specific/bsd/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/bsd/setup-hook.sh b/pkgs/os-specific/bsd/setup-hook.sh index 4bdfde68b62e7..0d0515d2ce5a7 100644 --- a/pkgs/os-specific/bsd/setup-hook.sh +++ b/pkgs/os-specific/bsd/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # BSD makefiles should be able to detect this # but without they end up using gcc on Darwin stdenv addMakeFlags() { From 500324aa07d8aa6dfe91efbcd42c20b539fcfcd6 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:34:36 +1300 Subject: [PATCH 249/360] freebsd: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/stdenv/freebsd/trivial-bootstrap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/freebsd/trivial-bootstrap.sh b/pkgs/stdenv/freebsd/trivial-bootstrap.sh index 34b4dbabc2bb3..941c4a7b58166 100644 --- a/pkgs/stdenv/freebsd/trivial-bootstrap.sh +++ b/pkgs/stdenv/freebsd/trivial-bootstrap.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash set -e set -o nounset set -o pipefail From 7385218b11fe4f7194b834aa32851092759c88fb Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:35:58 +1300 Subject: [PATCH 250/360] adobe-reader: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/applications/misc/adobe-reader/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/adobe-reader/builder.sh b/pkgs/applications/misc/adobe-reader/builder.sh index 41281385c990d..1fd7715ed9d30 100644 --- a/pkgs/applications/misc/adobe-reader/builder.sh +++ b/pkgs/applications/misc/adobe-reader/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup echo "unpacking $src..." From e3fa4f7f24bf3e6eb095a4d2faf80fb02190f747 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:35:58 +1300 Subject: [PATCH 251/360] libreoffice: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/applications/office/libreoffice/download-list-builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/office/libreoffice/download-list-builder.sh b/pkgs/applications/office/libreoffice/download-list-builder.sh index c054e2c72cbe9..a47abcbf8f143 100644 --- a/pkgs/applications/office/libreoffice/download-list-builder.sh +++ b/pkgs/applications/office/libreoffice/download-list-builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup tar --extract --file=$src libreoffice-$version/download.lst -O > $out From 31a88f8cbf894d86265e85e521aedb443441a45e Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:35:58 +1300 Subject: [PATCH 252/360] build-rust-crate: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/rust/build-rust-crate/lib.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh index d4927b025aa87..5582f927df75b 100644 --- a/pkgs/build-support/rust/build-rust-crate/lib.sh +++ b/pkgs/build-support/rust/build-rust-crate/lib.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash echo_build_heading() { if (( $# == 1 )); then echo_colored "Building $1" From 6c24971fc530a0bd7354f1e1235891982e823a25 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:35:58 +1300 Subject: [PATCH 253/360] hooks: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/build-support/rust/hooks/cargo-build-hook.sh | 1 + pkgs/build-support/rust/hooks/cargo-check-hook.sh | 1 + pkgs/build-support/rust/hooks/cargo-install-hook.sh | 1 + pkgs/build-support/rust/hooks/cargo-setup-hook.sh | 1 + pkgs/build-support/rust/hooks/maturin-build-hook.sh | 1 + 5 files changed, 5 insertions(+) diff --git a/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/pkgs/build-support/rust/hooks/cargo-build-hook.sh index 54ed765012b92..e3dbfb97e3a8f 100644 --- a/pkgs/build-support/rust/hooks/cargo-build-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-build-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash declare -a cargoBuildFlags cargoBuildHook() { diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh index 57fc2779cfe96..3aefcbad1d2e4 100644 --- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash declare -a checkFlags declare -a cargoTestFlags diff --git a/pkgs/build-support/rust/hooks/cargo-install-hook.sh b/pkgs/build-support/rust/hooks/cargo-install-hook.sh index 69ce726693665..db582ac150fbf 100644 --- a/pkgs/build-support/rust/hooks/cargo-install-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-install-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash cargoInstallPostBuildHook() { echo "Executing cargoInstallPostBuildHook" diff --git a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh index 842e66b5170e5..90b089c67c381 100644 --- a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash cargoSetupPostUnpackHook() { echo "Executing cargoSetupPostUnpackHook" diff --git a/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/pkgs/build-support/rust/hooks/maturin-build-hook.sh index 7e2599d922405..977c681779c32 100644 --- a/pkgs/build-support/rust/hooks/maturin-build-hook.sh +++ b/pkgs/build-support/rust/hooks/maturin-build-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash maturinBuildHook() { echo "Executing maturinBuildHook" From 9a428260e5ab7b303bf0a2df968e6a7c2a284e98 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:35:59 +1300 Subject: [PATCH 254/360] rnrs: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/data/documentation/rnrs/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/documentation/rnrs/builder.sh b/pkgs/data/documentation/rnrs/builder.sh index 6ec5c855ababe..44cc6bca3858f 100644 --- a/pkgs/data/documentation/rnrs/builder.sh +++ b/pkgs/data/documentation/rnrs/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source "$stdenv/setup" || exit 1 # XXX: Eventually we could consider building the PDF/PS files as well. From fbe56fe22933e2fc3484cee95cfa43263dfe143d Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:35:59 +1300 Subject: [PATCH 255/360] cacert: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/data/misc/cacert/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/misc/cacert/setup-hook.sh b/pkgs/data/misc/cacert/setup-hook.sh index 93b682fbbd12a..ed834ea7c45d2 100644 --- a/pkgs/data/misc/cacert/setup-hook.sh +++ b/pkgs/data/misc/cacert/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash export NIX_SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt # compatibility From 62d502445d82797ce080c9f9376f0d3f09fe669f Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:35:59 +1300 Subject: [PATCH 256/360] geolite-legacy: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/data/misc/geolite-legacy/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/misc/geolite-legacy/builder.sh b/pkgs/data/misc/geolite-legacy/builder.sh index 0bb61d863ecea..df938fc7aa569 100644 --- a/pkgs/data/misc/geolite-legacy/builder.sh +++ b/pkgs/data/misc/geolite-legacy/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source "$stdenv/setup" mkdir -p $out/share/GeoIP From 6e65ccced23f415458be46200fe0fd172fdb16f8 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:35:59 +1300 Subject: [PATCH 257/360] tzdata: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/data/misc/tzdata/tzdata-setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/misc/tzdata/tzdata-setup-hook.sh b/pkgs/data/misc/tzdata/tzdata-setup-hook.sh index 9975d0aec31a4..e3963d1865ed8 100644 --- a/pkgs/data/misc/tzdata/tzdata-setup-hook.sh +++ b/pkgs/data/misc/tzdata/tzdata-setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash tzdataHook() { export TZDIR=@out@/share/zoneinfo } From 766a918b5930f08324853cec899b59cda8e2d305 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:35:59 +1300 Subject: [PATCH 258/360] make: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/desktops/gnustep/make/builder.sh | 1 + pkgs/desktops/gnustep/make/setup-hook.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/desktops/gnustep/make/builder.sh b/pkgs/desktops/gnustep/make/builder.sh index 39bd77038281c..cadebe3d2c992 100644 --- a/pkgs/desktops/gnustep/make/builder.sh +++ b/pkgs/desktops/gnustep/make/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup preConfigure() { diff --git a/pkgs/desktops/gnustep/make/setup-hook.sh b/pkgs/desktops/gnustep/make/setup-hook.sh index 177a381100a64..2da7858f78442 100644 --- a/pkgs/desktops/gnustep/make/setup-hook.sh +++ b/pkgs/desktops/gnustep/make/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # this path is used by some packages to install additional makefiles export DESTDIR_GNUSTEP_MAKEFILES=$out/share/GNUstep/Makefiles From c1ed4456bd49ba624e6bd0887807af5fffb88e5d Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:00 +1300 Subject: [PATCH 259/360] lxqt-build-tools: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/desktops/lxqt/lxqt-build-tools/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/setup-hook.sh b/pkgs/desktops/lxqt/lxqt-build-tools/setup-hook.sh index e40765116e9cc..ee99beacad6b5 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/setup-hook.sh +++ b/pkgs/desktops/lxqt/lxqt-build-tools/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash LXQtCMakePostHook() { cmakeFlagsArray+=( -DLXQT_LIBRARY_NAME=lxqt From e56e533792d4b007f676c5476d5c9594f1e2e401 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:00 +1300 Subject: [PATCH 260/360] aspectj: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/compilers/aspectj/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/aspectj/builder.sh b/pkgs/development/compilers/aspectj/builder.sh index 3b43937200423..5ebf980f8e2c7 100755 --- a/pkgs/development/compilers/aspectj/builder.sh +++ b/pkgs/development/compilers/aspectj/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup export JAVA_HOME=$jre From 410402ab79c09a3d3f3af0c64313455c26e1ff67 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:00 +1300 Subject: [PATCH 261/360] ats2: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/compilers/ats2/setup-contrib-hook.sh | 1 + pkgs/development/compilers/ats2/setup-hook.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/compilers/ats2/setup-contrib-hook.sh b/pkgs/development/compilers/ats2/setup-contrib-hook.sh index 8c5e123b61c4d..38820ceeee27b 100644 --- a/pkgs/development/compilers/ats2/setup-contrib-hook.sh +++ b/pkgs/development/compilers/ats2/setup-contrib-hook.sh @@ -1 +1,2 @@ +# shellcheck shell=bash export PATSHOMERELOC=@out@/lib/ats2-postiats-@version@ diff --git a/pkgs/development/compilers/ats2/setup-hook.sh b/pkgs/development/compilers/ats2/setup-hook.sh index 67647b1edf695..6ad8dab4e4e94 100644 --- a/pkgs/development/compilers/ats2/setup-hook.sh +++ b/pkgs/development/compilers/ats2/setup-hook.sh @@ -1 +1,2 @@ +# shellcheck shell=bash export PATSHOME=@out@/lib/ats2-postiats-@version@ From 283bf4b440a6387fb37fe1ab1667400d895ad621 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:00 +1300 Subject: [PATCH 262/360] chez: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/compilers/chez/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/chez/setup-hook.sh b/pkgs/development/compilers/chez/setup-hook.sh index 1d81489bd4e46..a81d65c8ee8a7 100644 --- a/pkgs/development/compilers/chez/setup-hook.sh +++ b/pkgs/development/compilers/chez/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addChezLibraryPath() { addToSearchPath CHEZSCHEMELIBDIRS "$1/lib/csv-site" } From 25425be16c755981e196be7d5a9c32c393024bb5 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:00 +1300 Subject: [PATCH 263/360] fpc: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/compilers/fpc/binary-builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/fpc/binary-builder.sh b/pkgs/development/compilers/fpc/binary-builder.sh index 4308c1ed211ae..0ba74ac760929 100755 --- a/pkgs/development/compilers/fpc/binary-builder.sh +++ b/pkgs/development/compilers/fpc/binary-builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup tar xf $src From 33431232d652d91638ef51d844055c88672c8c7b Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:00 +1300 Subject: [PATCH 264/360] gcc: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/compilers/gcc/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index e6d41d7b29ab7..a866fbccd9fa4 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup From 6cde178e7a5592b870e4bae1cc5cc3904324241e Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:00 +1300 Subject: [PATCH 265/360] haxe: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/compilers/haxe/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/haxe/setup-hook.sh b/pkgs/development/compilers/haxe/setup-hook.sh index e6496107a5ee1..d6572357b9421 100644 --- a/pkgs/development/compilers/haxe/setup-hook.sh +++ b/pkgs/development/compilers/haxe/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addHaxeLibPath() { if [ ! -d "$1/lib/haxe/std" ]; then addToSearchPath HAXELIB_PATH "$1/lib/haxe" From d803ca58291a8e490efc63c59d03eeb7ef38b813 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:00 +1300 Subject: [PATCH 266/360] ios-cross-compile: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/compilers/ios-cross-compile/9.2_builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh b/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh index 68ba3ed3a920a..319427fa47c4e 100644 --- a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh +++ b/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # -*- shell-script -*- source $stdenv/setup From ea3b191f3cc79a6d7792f125ae8dea37de5cb027 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:00 +1300 Subject: [PATCH 267/360] ocaml: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/compilers/ocaml/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/ocaml/builder.sh b/pkgs/development/compilers/ocaml/builder.sh index a1807682d8674..d23ff26216594 100644 --- a/pkgs/development/compilers/ocaml/builder.sh +++ b/pkgs/development/compilers/ocaml/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup configureFlags="-prefix $out $configureFlags" From 369655cc20194d3a8e47d86cc78b83a002008853 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:00 +1300 Subject: [PATCH 268/360] oraclejdk: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh index 459bfce509885..501b8122d3e45 100644 --- a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh +++ b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup echo "Unpacking distribution" @@ -57,4 +58,3 @@ fi mkdir $jrePath/lib/$architecture/plugins ln -s $jrePath/lib/$architecture/libnpjp2.so $jrePath/lib/$architecture/plugins - From 7386170c46a1918f08132f2a1434827d9a89a54d Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:00 +1300 Subject: [PATCH 269/360] rust: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/compilers/rust/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/rust/setup-hook.sh b/pkgs/development/compilers/rust/setup-hook.sh index 5d4eb642fec00..871df6d9c4eb8 100644 --- a/pkgs/development/compilers/rust/setup-hook.sh +++ b/pkgs/development/compilers/rust/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Fix 'failed to open: /homeless-shelter/.cargo/.package-cache' in rust 1.36. if [[ -z ${IN_NIX_SHELL-} && -z ${CARGO_HOME-} ]]; then export CARGO_HOME=$TMPDIR From a8c86f7d09977d532ff0d829240d45686d90d24f Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:00 +1300 Subject: [PATCH 270/360] vala: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/compilers/vala/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/vala/setup-hook.sh b/pkgs/development/compilers/vala/setup-hook.sh index 8252143e998b8..489e08172400e 100644 --- a/pkgs/development/compilers/vala/setup-hook.sh +++ b/pkgs/development/compilers/vala/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash make_vala_find_vapi_files() { # XDG_DATA_DIRS: required for finding .vapi files if [ -d "$1/share/vala/vapi" -o -d "$1/share/vala-@apiVersion@/vapi" ]; then From d644e59ee53eedc37a10edab48eb720a5e17e14e Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:01 +1300 Subject: [PATCH 271/360] yosys: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/compilers/yosys/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/yosys/setup-hook.sh b/pkgs/development/compilers/yosys/setup-hook.sh index d01bbdd1a8c12..c16477eaff605 100644 --- a/pkgs/development/compilers/yosys/setup-hook.sh +++ b/pkgs/development/compilers/yosys/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addYosysPluginPath() { addToSearchPath NIX_YOSYS_PLUGIN_DIRS "$1/share/yosys/plugins" } From c736bdc2d011912b9b438efb04160f541e88372a Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:01 +1300 Subject: [PATCH 272/360] blackmagic: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/embedded/blackmagic/helper.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/embedded/blackmagic/helper.sh b/pkgs/development/embedded/blackmagic/helper.sh index bae57f633cfbf..3f9a1aa08977f 100755 --- a/pkgs/development/embedded/blackmagic/helper.sh +++ b/pkgs/development/embedded/blackmagic/helper.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash ################################################################################ # Build all of the platforms manually since the `all_platforms' target # doesn't preserve all of the build outputs and overrides CFLAGS. From 8f809c11c3025a76d2e050cb357bb6d5e2adea4e Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:01 +1300 Subject: [PATCH 273/360] tools: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/go-modules/tools/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/go-modules/tools/setup-hook.sh b/pkgs/development/go-modules/tools/setup-hook.sh index e354e50c35aac..16b393731d5e3 100644 --- a/pkgs/development/go-modules/tools/setup-hook.sh +++ b/pkgs/development/go-modules/tools/setup-hook.sh @@ -1 +1,2 @@ +# shellcheck shell=bash export GOTOOLDIR=@bin@/bin From 7180cb6fe36ffbd9bb884c5397d3923ffb064899 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:01 +1300 Subject: [PATCH 274/360] tools: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/go-packages/tools/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/go-packages/tools/setup-hook.sh b/pkgs/development/go-packages/tools/setup-hook.sh index e354e50c35aac..16b393731d5e3 100644 --- a/pkgs/development/go-packages/tools/setup-hook.sh +++ b/pkgs/development/go-packages/tools/setup-hook.sh @@ -1 +1,2 @@ +# shellcheck shell=bash export GOTOOLDIR=@bin@/bin From 918323afb8a4260421c6f655d13bae1c99a7854c Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:01 +1300 Subject: [PATCH 275/360] guile: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/interpreters/guile/setup-hook-1.8.sh | 1 + pkgs/development/interpreters/guile/setup-hook-2.0.sh | 1 + pkgs/development/interpreters/guile/setup-hook-2.2.sh | 1 + pkgs/development/interpreters/guile/setup-hook-3.0.sh | 1 + 4 files changed, 4 insertions(+) diff --git a/pkgs/development/interpreters/guile/setup-hook-1.8.sh b/pkgs/development/interpreters/guile/setup-hook-1.8.sh index 946e595ac0bf5..86da7e7e49ea6 100644 --- a/pkgs/development/interpreters/guile/setup-hook-1.8.sh +++ b/pkgs/development/interpreters/guile/setup-hook-1.8.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addGuileLibPath () { if test -d "$1/share/guile/site"; then export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site" diff --git a/pkgs/development/interpreters/guile/setup-hook-2.0.sh b/pkgs/development/interpreters/guile/setup-hook-2.0.sh index d83f9c6470573..c3029e65f90e3 100644 --- a/pkgs/development/interpreters/guile/setup-hook-2.0.sh +++ b/pkgs/development/interpreters/guile/setup-hook-2.0.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addGuileLibPath () { if test -d "$1/share/guile/site/2.0"; then export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.0" diff --git a/pkgs/development/interpreters/guile/setup-hook-2.2.sh b/pkgs/development/interpreters/guile/setup-hook-2.2.sh index d6bb23e7949a5..1f3e8b1756f38 100644 --- a/pkgs/development/interpreters/guile/setup-hook-2.2.sh +++ b/pkgs/development/interpreters/guile/setup-hook-2.2.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addGuileLibPath () { if test -d "$1/share/guile/site/2.2"; then export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.2" diff --git a/pkgs/development/interpreters/guile/setup-hook-3.0.sh b/pkgs/development/interpreters/guile/setup-hook-3.0.sh index e13ec2767fd49..1a243772c7b37 100644 --- a/pkgs/development/interpreters/guile/setup-hook-3.0.sh +++ b/pkgs/development/interpreters/guile/setup-hook-3.0.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addGuileLibPath () { if test -d "$1/share/guile/site/3.0"; then export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site/3.0" From ea2192e181276804b2385e16300a54bcc7ff5c1f Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:01 +1300 Subject: [PATCH 276/360] lua-5: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/interpreters/lua-5/hooks/setup-hook.sh | 1 + pkgs/development/interpreters/lua-5/wrap.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh b/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh index 1c445b82afded..71e6865aa6382 100644 --- a/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh +++ b/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # set -e nix_print() { diff --git a/pkgs/development/interpreters/lua-5/wrap.sh b/pkgs/development/interpreters/lua-5/wrap.sh index 5941ff4a6b985..08bbff9ce4555 100644 --- a/pkgs/development/interpreters/lua-5/wrap.sh +++ b/pkgs/development/interpreters/lua-5/wrap.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Inspired by python/wrapper.nix # Wrapper around wrapLuaProgramsIn, below. The $luaPath # variable is passed in from the buildLuarocksPackage function. From 615de8c9d2f47932e2ffdd95a866390e9f05a0ac Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:01 +1300 Subject: [PATCH 277/360] octave: Indicate shell to ShellCheck ShellCheck SC2148. --- .../octave/hooks/octave-write-required-octave-packages-hook.sh | 1 + .../octave/hooks/write-required-octave-packages-hook.sh | 1 + pkgs/development/interpreters/octave/wrap.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh b/pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh index 64e87d68246f1..ac6acb7ccc745 100644 --- a/pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh +++ b/pkgs/development/interpreters/octave/hooks/octave-write-required-octave-packages-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Setup hook for writing octave packages that are run-time dependencies for # another package to a nix-support file. # `echo`s the full path name to the package derivation that is required. diff --git a/pkgs/development/interpreters/octave/hooks/write-required-octave-packages-hook.sh b/pkgs/development/interpreters/octave/hooks/write-required-octave-packages-hook.sh index 032ea398ac568..d4904e6ddf7e8 100644 --- a/pkgs/development/interpreters/octave/hooks/write-required-octave-packages-hook.sh +++ b/pkgs/development/interpreters/octave/hooks/write-required-octave-packages-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Setup hook for writing octave packages that are run-time dependencies for # another package to a nix-support file. # `echo`s the full path name to the package derivation that is required. diff --git a/pkgs/development/interpreters/octave/wrap.sh b/pkgs/development/interpreters/octave/wrap.sh index a5969fca2a96e..a0cd366274cea 100644 --- a/pkgs/development/interpreters/octave/wrap.sh +++ b/pkgs/development/interpreters/octave/wrap.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Unlinks a directory (given as the first argument), and re-creates that # directory as an actual directory. Then descends into the directory of # the same name in the origin (arg_2/arg_3) and symlinks the contents of From 6be04e76582a4ec13adbc8836b5b49978415585e Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:01 +1300 Subject: [PATCH 278/360] perl: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/interpreters/perl/setup-hook-cross.sh | 1 + pkgs/development/interpreters/perl/setup-hook.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/perl/setup-hook-cross.sh b/pkgs/development/interpreters/perl/setup-hook-cross.sh index a7aad6f2453ea..f65bb461e90e4 100644 --- a/pkgs/development/interpreters/perl/setup-hook-cross.sh +++ b/pkgs/development/interpreters/perl/setup-hook-cross.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addPerlLibPath () { addToSearchPath PERL5LIB $1/lib/perl5/site_perl/@version@ addToSearchPath PERL5LIB $1/lib/perl5/site_perl/cross_perl/@version@ diff --git a/pkgs/development/interpreters/perl/setup-hook.sh b/pkgs/development/interpreters/perl/setup-hook.sh index 7909412806c82..5116d052845b8 100644 --- a/pkgs/development/interpreters/perl/setup-hook.sh +++ b/pkgs/development/interpreters/perl/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addPerlLibPath () { addToSearchPath PERL5LIB $1/lib/perl5/site_perl } From 110f336ce122256aca1ec80ced9f19e4f4875f95 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:02 +1300 Subject: [PATCH 279/360] python: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/interpreters/python/setup-hook.sh | 1 + pkgs/development/interpreters/python/wrap.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/python/setup-hook.sh b/pkgs/development/interpreters/python/setup-hook.sh index 523df5762fadb..b911003a8d408 100644 --- a/pkgs/development/interpreters/python/setup-hook.sh +++ b/pkgs/development/interpreters/python/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addPythonPath() { addToSearchPathWithCustomDelimiter : PYTHONPATH $1/@sitePackages@ } diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index f10ba003432be..e4172fbdbc787 100644 --- a/pkgs/development/interpreters/python/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Wrapper around wrapPythonProgramsIn, below. The $pythonPath # variable is passed in from the buildPythonPackage function. wrapPythonPrograms() { From fec4c12ab16f102e3fb4b61e7039e7939f12cb8c Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:02 +1300 Subject: [PATCH 280/360] tcl: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/interpreters/tcl/tcl-package-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/tcl/tcl-package-hook.sh b/pkgs/development/interpreters/tcl/tcl-package-hook.sh index 41603037931ff..2422a519151b6 100644 --- a/pkgs/development/interpreters/tcl/tcl-package-hook.sh +++ b/pkgs/development/interpreters/tcl/tcl-package-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # This hook ensures that we do the following in post-fixup: # * wrap any installed executables with a wrapper that configures TCLLIBPATH # * write a setup hook that extends the TCLLIBPATH of any anti-dependencies From 69c3ac88d606a7042962902f6f80d7573910b281 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:02 +1300 Subject: [PATCH 281/360] SDL: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/SDL/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/SDL/setup-hook.sh b/pkgs/development/libraries/SDL/setup-hook.sh index 553e8553a77f4..45a4591c6d381 100644 --- a/pkgs/development/libraries/SDL/setup-hook.sh +++ b/pkgs/development/libraries/SDL/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addSDLPath () { if [ -e "$1/include/SDL" ]; then export SDL_PATH="${SDL_PATH-}${SDL_PATH:+ }$1/include/SDL" From 51076ae2ea05c9f82a3846cda82b74983e13004a Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:02 +1300 Subject: [PATCH 282/360] SDL2: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/SDL2/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/SDL2/setup-hook.sh b/pkgs/development/libraries/SDL2/setup-hook.sh index 0119926491afe..58dd902b549be 100644 --- a/pkgs/development/libraries/SDL2/setup-hook.sh +++ b/pkgs/development/libraries/SDL2/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addSDL2Path () { if [ -e "$1/include/SDL2" ]; then export SDL2_PATH="${SDL2_PATH-}${SDL2_PATH:+ }$1/include/SDL2" From f6f43f261b9acf9230556bcc4e54868f91ece71f Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:02 +1300 Subject: [PATCH 283/360] aws-c-common: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/aws-c-common/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/aws-c-common/setup-hook.sh b/pkgs/development/libraries/aws-c-common/setup-hook.sh index e670f7cf85299..06418eff60ecc 100644 --- a/pkgs/development/libraries/aws-c-common/setup-hook.sh +++ b/pkgs/development/libraries/aws-c-common/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addAwsCCommonModuleDir() { cmakeFlags="-DCMAKE_MODULE_PATH=@out@/lib/cmake ${cmakeFlags:-}" } From fa3af580158b6d6676887624e2df0eafa24e7674 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:02 +1300 Subject: [PATCH 284/360] dleyna-core: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/dleyna-core/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/dleyna-core/setup-hook.sh b/pkgs/development/libraries/dleyna-core/setup-hook.sh index 287ad4dc18972..897cc27fb52bd 100644 --- a/pkgs/development/libraries/dleyna-core/setup-hook.sh +++ b/pkgs/development/libraries/dleyna-core/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addDleynaConnectorPath () { if test -d "$1/lib/dleyna-1.0/connectors" then From 27cf2fb9840798cb583b11d3370662278a4740e3 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:02 +1300 Subject: [PATCH 285/360] elementary-cmake-modules: Indicate shell to ShellCheck ShellCheck SC2148. --- .../development/libraries/elementary-cmake-modules/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh b/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh index 6408ac471577a..cb2cf7edb51fd 100644 --- a/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh +++ b/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash _elementaryCMakeEnvHook() { cmakeFlagsArray+=(-DCMAKE_MODULE_PATH=@out@/lib/cmake) } From 2902840251e517d709c4ee27d0b6d74b9730281c Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:02 +1300 Subject: [PATCH 286/360] gdk-pixbuf: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/gdk-pixbuf/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh index ecf9793b91f6c..580fc417c3dd1 100644 --- a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh +++ b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash findGdkPixbufLoaders() { # choose the longest loaders.cache From 02ca211e5f9898fc2be870fb013301d852a4b471 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:02 +1300 Subject: [PATCH 287/360] gettext: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/gettext/gettext-setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gettext/gettext-setup-hook.sh b/pkgs/development/libraries/gettext/gettext-setup-hook.sh index 5cc9655a89bc7..b636d10f66384 100644 --- a/pkgs/development/libraries/gettext/gettext-setup-hook.sh +++ b/pkgs/development/libraries/gettext/gettext-setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash gettextDataDirsHook() { # See pkgs/build-support/setup-hooks/role.bash getHostRoleEnvHook From d071e394b416235771d3c5cb13912bcd83854f71 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:02 +1300 Subject: [PATCH 288/360] glib: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/glib/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh index 8ead5510ec4f0..e2b0fa09c960d 100644 --- a/pkgs/development/libraries/glib/setup-hook.sh +++ b/pkgs/development/libraries/glib/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash make_glib_find_gsettings_schemas() { # For packages that need gschemas of other packages (e.g. empathy) for maybe_dir in "$1"/share/gsettings-schemas/*; do From 9f6336fd7f5e67fb9eb8bc46763dc1ed6c538aca Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:03 +1300 Subject: [PATCH 289/360] glibc: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/glibc/locales-builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/glibc/locales-builder.sh b/pkgs/development/libraries/glibc/locales-builder.sh index d732e208fa22a..a29910e056082 100644 --- a/pkgs/development/libraries/glibc/locales-builder.sh +++ b/pkgs/development/libraries/glibc/locales-builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Glibc cannot have itself in its RPATH. export NIX_NO_SELF_RPATH=1 From 983cc0d6ec8e31d0bda4c953745b1590cee002c5 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:03 +1300 Subject: [PATCH 290/360] gobject-introspection: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/gobject-introspection/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/pkgs/development/libraries/gobject-introspection/setup-hook.sh index 6bee47aeb096d..786b3ead37a2c 100644 --- a/pkgs/development/libraries/gobject-introspection/setup-hook.sh +++ b/pkgs/development/libraries/gobject-introspection/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash make_gobject_introspection_find_gir_files() { # required for .typelib files, eg mypaint git version if [ -d "$1/lib/girepository-1.0" ]; then From dabc22b612ee2e13610f03e47283b9f6770a9fdc Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:03 +1300 Subject: [PATCH 291/360] grilo: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/grilo/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/grilo/setup-hook.sh b/pkgs/development/libraries/grilo/setup-hook.sh index 9337c520a2075..f4e33f3ccdcd1 100644 --- a/pkgs/development/libraries/grilo/setup-hook.sh +++ b/pkgs/development/libraries/grilo/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash make_grilo_find_plugins() { if [ -d "$1"/lib/grilo-0.3 ]; then addToSearchPath GRL_PLUGIN_PATH "$1/lib/grilo-0.3" From 41cdd76166d516749f554bb8ce1b67cf609ebe4b Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:03 +1300 Subject: [PATCH 292/360] gtk-sharp: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/gtk-sharp/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gtk-sharp/builder.sh b/pkgs/development/libraries/gtk-sharp/builder.sh index 4b8f757540b55..8c60a771f783e 100644 --- a/pkgs/development/libraries/gtk-sharp/builder.sh +++ b/pkgs/development/libraries/gtk-sharp/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup genericBuild From f597b1d7e08c7ee430be81bdc18ed6548d982b60 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:03 +1300 Subject: [PATCH 293/360] kde-frameworks: Indicate shell to ShellCheck ShellCheck SC2148. --- .../libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh | 1 + pkgs/development/libraries/kde-frameworks/fetch.sh | 1 + .../libraries/kde-frameworks/kdelibs4support/setup-hook.sh | 1 + .../development/libraries/kde-frameworks/kdoctools/setup-hook.sh | 1 + 4 files changed, 4 insertions(+) diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh index 4135f6bfd7aa3..bb2addf8fb18c 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash ecmEnvHook() { addToSearchPath XDG_DATA_DIRS "$1/share" addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg" diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 7f6c19667e154..e80cc434919be 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1,2 @@ +# shellcheck shell=bash WGET_ARGS=( https://download.kde.org/stable/frameworks/5.87/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh index 21ac2e83b5dae..391b49f38c3d1 100644 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh @@ -1 +1,2 @@ +# shellcheck shell=bash export NIX_KDE_INCLUDE_DIR="@dev@/include/" # trailing slash is required! diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh index 2928d9b34dbed..1d109fd3941da 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addXdgData() { addToSearchPath XDG_DATA_DIRS "$1/share" } From 8a8e3b054891a5f399f35869b96c5853122e0198 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:03 +1300 Subject: [PATCH 294/360] libiconv: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/libiconv/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libiconv/setup-hook.sh b/pkgs/development/libraries/libiconv/setup-hook.sh index 3d9656ffe5d60..cb0c4461f13e3 100644 --- a/pkgs/development/libraries/libiconv/setup-hook.sh +++ b/pkgs/development/libraries/libiconv/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # libiconv must be listed in load flags on non-Glibc # it doesn't hurt to have it in Glibc either though From 0363a1afdf43540e89e64947530da23676ab9090 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:03 +1300 Subject: [PATCH 295/360] librep: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/librep/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/librep/setup-hook.sh b/pkgs/development/libraries/librep/setup-hook.sh index 4d875b6933040..435147aa5f248 100644 --- a/pkgs/development/libraries/librep/setup-hook.sh +++ b/pkgs/development/libraries/librep/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addRepDLLoadPath () { addToSearchPath REP_DL_LOAD_PATH $1/lib/rep } From a4f58fef42ab1ca2cc252787561e1155ca51923e Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:03 +1300 Subject: [PATCH 296/360] linenoise: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/linenoise/create-pkg-config-file.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/linenoise/create-pkg-config-file.sh b/pkgs/development/libraries/linenoise/create-pkg-config-file.sh index e3c38f05ab4c9..765ae795ac2c3 100755 --- a/pkgs/development/libraries/linenoise/create-pkg-config-file.sh +++ b/pkgs/development/libraries/linenoise/create-pkg-config-file.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash cat < linenoise.pc prefix=$out exec_prefix=\${prefix} From 3f3927b0969c0e13e2a13065180355982369db61 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:03 +1300 Subject: [PATCH 297/360] memorymapping: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/memorymapping/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/memorymapping/setup-hook.sh b/pkgs/development/libraries/memorymapping/setup-hook.sh index 5ee3470fe3705..a367de1d1d2e2 100644 --- a/pkgs/development/libraries/memorymapping/setup-hook.sh +++ b/pkgs/development/libraries/memorymapping/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash useMemorymapping () { export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE-}${NIX_CFLAGS_COMPILE:+ }-include fmemopen.h"; export NIX_LDFLAGS="${NIX_LDFLAGS-}${NIX_LDFLAGS:+ }-lmemorymapping"; From c6d0669def255d5333974d74c78774d0c59153e9 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:03 +1300 Subject: [PATCH 298/360] memstream: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/memstream/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/memstream/setup-hook.sh b/pkgs/development/libraries/memstream/setup-hook.sh index 09aabe7488411..a8229e6b4e95c 100644 --- a/pkgs/development/libraries/memstream/setup-hook.sh +++ b/pkgs/development/libraries/memstream/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash useMemstream () { export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE-}${NIX_CFLAGS_COMPILE:+ }-include memstream.h"; export NIX_LDFLAGS="${NIX_LDFLAGS-}${NIX_LDFLAGS:+ }-lmemstream"; From dbc2c316981acc74df1bd2d41f71b36be501efad Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:03 +1300 Subject: [PATCH 299/360] rep-gtk: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/rep-gtk/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/rep-gtk/setup-hook.sh b/pkgs/development/libraries/rep-gtk/setup-hook.sh index 4d875b6933040..435147aa5f248 100644 --- a/pkgs/development/libraries/rep-gtk/setup-hook.sh +++ b/pkgs/development/libraries/rep-gtk/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addRepDLLoadPath () { addToSearchPath REP_DL_LOAD_PATH $1/lib/rep } From ae22276426e134684832780e641d99e87671b0b9 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:03 +1300 Subject: [PATCH 300/360] slib: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/slib/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/slib/setup-hook.sh b/pkgs/development/libraries/slib/setup-hook.sh index e820d80e7a4ea..60c174cb0c9e1 100644 --- a/pkgs/development/libraries/slib/setup-hook.sh +++ b/pkgs/development/libraries/slib/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addSlibPath () { if test -f "$1/lib/slib/slibcat" then From 2959c350d86f15ec3364e73d64438c2cbf43a452 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:03 +1300 Subject: [PATCH 301/360] wtk: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/wtk/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/development/libraries/wtk/builder.sh index 86f2719537cd0..b8254f550896d 100644 --- a/pkgs/development/libraries/wtk/builder.sh +++ b/pkgs/development/libraries/wtk/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup mkdir unzipped From b033ed324b2b519662facaa8aadca195f5429f9e Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:03 +1300 Subject: [PATCH 302/360] clwrapper: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/lisp-modules/clwrapper/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh index 5cb238b2973f2..6073b42c9530a 100644 --- a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh +++ b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash NIX_LISP_ASDF="@out@" CL_SOURCE_REGISTRY="${CL_SOURCE_REGISTRY:+$CL_SOURCE_REGISTRY:}@out@/lib/common-lisp/asdf/" From 02ca22d655246a6bdd249dbd8e054cf668bf9c43 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:04 +1300 Subject: [PATCH 303/360] webos: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/mobile/webos/cmake-setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/mobile/webos/cmake-setup-hook.sh b/pkgs/development/mobile/webos/cmake-setup-hook.sh index 7e52681e9a913..195671cd84f70 100644 --- a/pkgs/development/mobile/webos/cmake-setup-hook.sh +++ b/pkgs/development/mobile/webos/cmake-setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash _addWebOSCMakeFlags() { # Help find the webOS cmake module cmakeFlagsArray+=(-DCMAKE_MODULE_PATH=@out@/lib/cmake) From edc9fe90feb7fa5560753d5fcb8f2ce74cab563c Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:04 +1300 Subject: [PATCH 304/360] fetch-nimble: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/nim-packages/fetch-nimble/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/nim-packages/fetch-nimble/builder.sh b/pkgs/development/nim-packages/fetch-nimble/builder.sh index 693ab339408ed..a065a960f17f9 100644 --- a/pkgs/development/nim-packages/fetch-nimble/builder.sh +++ b/pkgs/development/nim-packages/fetch-nimble/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup export HOME=$NIX_BUILD_TOP From 5b7762f8f964b0c3bc56bc59d8fd045e8d431b18 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:04 +1300 Subject: [PATCH 305/360] eliom: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/ocaml-modules/eliom/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/eliom/setup-hook.sh b/pkgs/development/ocaml-modules/eliom/setup-hook.sh index 9868ab93f7919..f2eeb54d4f696 100644 --- a/pkgs/development/ocaml-modules/eliom/setup-hook.sh +++ b/pkgs/development/ocaml-modules/eliom/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addOcsigenDistilleryTemplate() { addToSearchPathWithCustomDelimiter : ELIOM_DISTILLERY_PATH $1/eliom-distillery-templates } From eb21504f21f132cda4d1608cdd82c4541d8b1115 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:04 +1300 Subject: [PATCH 306/360] ocamlmake: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh b/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh index 6d95043701658..11218f57509ad 100644 --- a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh +++ b/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addOcamlMakefile () { export OCAMLMAKEFILE="@out@/include/OCamlMakefile" } From 1a40b913db470f87a0e0c85f9e8b15f4fc5a3f0b Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:04 +1300 Subject: [PATCH 307/360] expression-generator: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/perl-modules/expression-generator/lib-cache.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/perl-modules/expression-generator/lib-cache.sh b/pkgs/development/perl-modules/expression-generator/lib-cache.sh index 65095144bcd68..3bdda1f8d5873 100644 --- a/pkgs/development/perl-modules/expression-generator/lib-cache.sh +++ b/pkgs/development/perl-modules/expression-generator/lib-cache.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # First argument: command to run # Second argument: cache name From 6dac49bdf96b5f25db2148acc506225de366a9a2 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:04 +1300 Subject: [PATCH 308/360] generic: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/perl-modules/generic/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index 9b42401fc4dcd..075828b8bca01 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/perl5/site_perl" From 8101f04397f5f56a03deb018b337692e1c150c15 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:04 +1300 Subject: [PATCH 309/360] rhpl: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/python-modules/rhpl/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/rhpl/builder.sh b/pkgs/development/python-modules/rhpl/builder.sh index 15e05a73f93fb..cae05b7f87718 100644 --- a/pkgs/development/python-modules/rhpl/builder.sh +++ b/pkgs/development/python-modules/rhpl/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup rpmextract $src From 90b1eab79217bee9f723f41cfa668d51226c05f7 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:04 +1300 Subject: [PATCH 310/360] xcbuild: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/tools/xcbuild/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh index f4b5abf2d8d38..56ec2c74344a8 100644 --- a/pkgs/development/tools/xcbuild/setup-hook.sh +++ b/pkgs/development/tools/xcbuild/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash xcbuildBuildPhase() { export DSTROOT=$out From 82fcc3820bc5d706da52633579f42c05d115fef1 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:04 +1300 Subject: [PATCH 311/360] nodejs: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/web/nodejs/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/web/nodejs/setup-hook.sh b/pkgs/development/web/nodejs/setup-hook.sh index 18368588c2afc..22b44cd1533c7 100644 --- a/pkgs/development/web/nodejs/setup-hook.sh +++ b/pkgs/development/web/nodejs/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addNodePath () { addToSearchPath NODE_PATH $1/lib/node_modules } From 76e44338c36e34f5ae3de152ee6a842b227696f7 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:04 +1300 Subject: [PATCH 312/360] wine: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/misc/emulators/wine/builder-wow.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/pkgs/misc/emulators/wine/builder-wow.sh index c006db3116b59..db8cf3e9bed0a 100644 --- a/pkgs/misc/emulators/wine/builder-wow.sh +++ b/pkgs/misc/emulators/wine/builder-wow.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash ## build described at http://wiki.winehq.org/Wine64 source $stdenv/setup From 9bf085743e6db9945656e61169b66facf2965d1c Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:04 +1300 Subject: [PATCH 313/360] print-reexports: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/os-specific/darwin/print-reexports/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/print-reexports/setup-hook.sh b/pkgs/os-specific/darwin/print-reexports/setup-hook.sh index 9efb00aeb4dc4..9f0228a8eea14 100644 --- a/pkgs/os-specific/darwin/print-reexports/setup-hook.sh +++ b/pkgs/os-specific/darwin/print-reexports/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash fixupOutputHooks+=('checkTbdReexports') checkTbdReexports() { From 7ccec1511af851b6c6c00d91e1019c4977352248 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:04 +1300 Subject: [PATCH 314/360] signing-utils: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh | 1 + pkgs/os-specific/darwin/signing-utils/utils.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh b/pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh index cca65661f8a9c..d755ad959faf6 100644 --- a/pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh +++ b/pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash postFixupHooks+=(signDarwinBinariesInAllOutputs) # Uses signingUtils, see definition of autoSignDarwinBinariesHook in diff --git a/pkgs/os-specific/darwin/signing-utils/utils.sh b/pkgs/os-specific/darwin/signing-utils/utils.sh index 6d23a461fc995..3be0c00c9aa40 100644 --- a/pkgs/os-specific/darwin/signing-utils/utils.sh +++ b/pkgs/os-specific/darwin/signing-utils/utils.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Work around for some odd behaviour where we can't codesign a file # in-place if it has been called before. This happens for example if # you try to fix-up a binary using strip/install_name_tool, after it From 6f5cb73bf270881ffc3179c902ab5474300e22fd Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:05 +1300 Subject: [PATCH 315/360] apparmor: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/os-specific/linux/apparmor/fix-rc.apparmor.functions.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/apparmor/fix-rc.apparmor.functions.sh b/pkgs/os-specific/linux/apparmor/fix-rc.apparmor.functions.sh index ebc1baaa92d4e..0651eb449696b 100644 --- a/pkgs/os-specific/linux/apparmor/fix-rc.apparmor.functions.sh +++ b/pkgs/os-specific/linux/apparmor/fix-rc.apparmor.functions.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash aa_action() { STRING=$1 shift From a4b90924f1186a92e3adf6f2acfd4d67599de1dd Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:05 +1300 Subject: [PATCH 316/360] hdapsd: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/os-specific/linux/hdapsd/postInstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/hdapsd/postInstall.sh b/pkgs/os-specific/linux/hdapsd/postInstall.sh index 37867817bf63f..1107910ee42ed 100644 --- a/pkgs/os-specific/linux/hdapsd/postInstall.sh +++ b/pkgs/os-specific/linux/hdapsd/postInstall.sh @@ -1,7 +1,7 @@ +# shellcheck shell=bash mkdir -p $out/lib/udev/rules.d $out/lib/systemd/system cp misc/hdapsd.rules $out/lib/udev/rules.d SBIN_REWRITE="s|@sbindir@|$out/bin|g" for i in misc/*.service.in do sed $SBIN_REWRITE "$i" > "$out/lib/systemd/system/$(basename ${i%.in})" done - From a380e297a1301cb06f3bbb0107c399681f1da49f Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:05 +1300 Subject: [PATCH 317/360] nvidia-x11: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index d108ca0d00608..e1be072841e8a 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup unpackManually() { From 78769b63f2ce6dd831e040098fd7e7a661ba04d4 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:36:05 +1300 Subject: [PATCH 318/360] paxctl: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/os-specific/linux/paxctl/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/paxctl/setup-hook.sh b/pkgs/os-specific/linux/paxctl/setup-hook.sh index 11a6bb9910f94..b1d8f9ebb2595 100644 --- a/pkgs/os-specific/linux/paxctl/setup-hook.sh +++ b/pkgs/os-specific/linux/paxctl/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # PaX-mark binaries. paxmark() { local flags="$1" From 15ebdba3762ceaf60e8a94f411c194c10bf43855 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:24 +1300 Subject: [PATCH 319/360] bootstrap-tools-musl: Indicate shell to ShellCheck ShellCheck SC2148. --- .../linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh index b160a748d8dc8..5791896368155 100644 --- a/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Unpack the bootstrap tools tarball. echo Unpacking the bootstrap tools... $builder mkdir $out From ef8c429a8fb1246953b7315f4f9e1e7de94ad823 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:24 +1300 Subject: [PATCH 320/360] bootstrap-tools: Indicate shell to ShellCheck ShellCheck SC2148. --- .../linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh index f394869ea915b..e7bb743ea7f04 100644 --- a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # Unpack the bootstrap tools tarball. echo Unpacking the bootstrap tools... $builder mkdir $out From 9552a6e60797478231cc5209dcba5b89e2e3d288 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:51 +1300 Subject: [PATCH 321/360] R: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/applications/science/math/R/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/math/R/setup-hook.sh b/pkgs/applications/science/math/R/setup-hook.sh index 6951e2a4b61bd..785fb4ca3453c 100644 --- a/pkgs/applications/science/math/R/setup-hook.sh +++ b/pkgs/applications/science/math/R/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addRLibPath () { if [[ -d "$1/library" ]]; then addToSearchPath R_LIBS_SITE "$1/library" From 992f5c183e63b94381c61b0eeb4a9fd794bbe277 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:51 +1300 Subject: [PATCH 322/360] root: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/applications/science/misc/root/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/misc/root/setup-hook.sh b/pkgs/applications/science/misc/root/setup-hook.sh index b26cf9b779f84..41de9edd11dc1 100644 --- a/pkgs/applications/science/misc/root/setup-hook.sh +++ b/pkgs/applications/science/misc/root/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash thisroot () { # Workaround thisroot.sh dependency on man if [ -z "${MANPATH-}" ]; then From bf23e6852daf43fa1f7fe3df7aea997d7428fdc6 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:51 +1300 Subject: [PATCH 323/360] 4: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/compilers/chicken/4/fetchegg/builder.sh | 1 + pkgs/development/compilers/chicken/4/setup-hook.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh b/pkgs/development/compilers/chicken/4/fetchegg/builder.sh index 2046610630905..eb0604831f387 100644 --- a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh +++ b/pkgs/development/compilers/chicken/4/fetchegg/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup header "exporting egg ${eggName} (version $version) into $out" diff --git a/pkgs/development/compilers/chicken/4/setup-hook.sh b/pkgs/development/compilers/chicken/4/setup-hook.sh index 661dc08c090c4..7cc777faac340 100644 --- a/pkgs/development/compilers/chicken/4/setup-hook.sh +++ b/pkgs/development/compilers/chicken/4/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addChickenRepositoryPath() { addToSearchPathWithCustomDelimiter : CHICKEN_REPOSITORY_EXTRA "$1/lib/chicken/8/" export CHICKEN_INCLUDE_PATH="$1/share${CHICKEN_INCLUDE_PATH:+;$CHICKEN_INCLUDE_PATH}" From e1feb7a19b7ecf407b86305e3fb7410653c73402 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:52 +1300 Subject: [PATCH 324/360] 5: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/compilers/chicken/5/fetchegg/builder.sh | 1 + pkgs/development/compilers/chicken/5/setup-hook.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/compilers/chicken/5/fetchegg/builder.sh b/pkgs/development/compilers/chicken/5/fetchegg/builder.sh index d9adf510f22d5..3a40259098998 100644 --- a/pkgs/development/compilers/chicken/5/fetchegg/builder.sh +++ b/pkgs/development/compilers/chicken/5/fetchegg/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup header "exporting egg ${eggName} (version $version) into $out" diff --git a/pkgs/development/compilers/chicken/5/setup-hook.sh b/pkgs/development/compilers/chicken/5/setup-hook.sh index 55324c05508eb..65e01076578c4 100644 --- a/pkgs/development/compilers/chicken/5/setup-hook.sh +++ b/pkgs/development/compilers/chicken/5/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addChickenRepositoryPath() { addToSearchPathWithCustomDelimiter : CHICKEN_REPOSITORY_PATH "$1/lib/chicken/11" addToSearchPathWithCustomDelimiter : CHICKEN_INCLUDE_PATH "$1/share" From bbf887453fdef18be5e6d185c0c25c0b2c21463f Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:52 +1300 Subject: [PATCH 325/360] 5: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/grantlee/5/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/grantlee/5/setup-hook.sh b/pkgs/development/libraries/grantlee/5/setup-hook.sh index b51cb4a319091..cd978e927980a 100644 --- a/pkgs/development/libraries/grantlee/5/setup-hook.sh +++ b/pkgs/development/libraries/grantlee/5/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash grantleePluginPrefix=@grantleePluginPrefix@ providesGrantleeRuntime() { From 6f6defb626a712bba24357e1abc10b21af860475 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:52 +1300 Subject: [PATCH 326/360] core: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/gstreamer/core/setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gstreamer/core/setup-hook.sh b/pkgs/development/libraries/gstreamer/core/setup-hook.sh index 026a4e5f55a00..3d5a48384497a 100644 --- a/pkgs/development/libraries/gstreamer/core/setup-hook.sh +++ b/pkgs/development/libraries/gstreamer/core/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addGstreamer1LibPath () { if test -d "$1/lib/gstreamer-1.0" then @@ -6,4 +7,3 @@ addGstreamer1LibPath () { } addEnvHooks "$hostOffset" addGstreamer1LibPath - From cc481479822e8571c90196c2ce107b2393145b04 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:52 +1300 Subject: [PATCH 327/360] httpunit: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/java/httpunit/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/java/httpunit/builder.sh b/pkgs/development/libraries/java/httpunit/builder.sh index 2738500829580..0f8d1f5e0b53c 100755 --- a/pkgs/development/libraries/java/httpunit/builder.sh +++ b/pkgs/development/libraries/java/httpunit/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup $unzip/bin/unzip $src From 7897f6c761caadc97e2054fb64a4779236a41897 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:52 +1300 Subject: [PATCH 328/360] jdom: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/java/jdom/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/java/jdom/builder.sh b/pkgs/development/libraries/java/jdom/builder.sh index dbec4b6f3e0e5..50bbe45a314c6 100755 --- a/pkgs/development/libraries/java/jdom/builder.sh +++ b/pkgs/development/libraries/java/jdom/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash set -e source $stdenv/setup From a29fae58aa66b4f09b18b99ea80105780415fa55 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:52 +1300 Subject: [PATCH 329/360] lucene: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/java/lucene/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/java/lucene/builder.sh b/pkgs/development/libraries/java/lucene/builder.sh index d95feb5eeb44f..6e63d5487ae6f 100755 --- a/pkgs/development/libraries/java/lucene/builder.sh +++ b/pkgs/development/libraries/java/lucene/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash set -e source $stdenv/setup From d165c17eccd3dcbec0361738a3077e96e47e4af4 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:52 +1300 Subject: [PATCH 330/360] cernlib: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/physics/cernlib/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/physics/cernlib/setup-hook.sh b/pkgs/development/libraries/physics/cernlib/setup-hook.sh index d837593277606..6b5215979a20b 100644 --- a/pkgs/development/libraries/physics/cernlib/setup-hook.sh +++ b/pkgs/development/libraries/physics/cernlib/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash export CERN_LEVEL=@version@ export CERN=@out@ export CERN_ROOT=$CERN/$CERN_LEVEL From ccac069c462a18376651894f39597927e4125f59 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:52 +1300 Subject: [PATCH 331/360] geant4: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/physics/geant4/datasets-hook.sh | 1 + pkgs/development/libraries/physics/geant4/geant4-hook.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/libraries/physics/geant4/datasets-hook.sh b/pkgs/development/libraries/physics/geant4/datasets-hook.sh index 8aed8b8832b3e..49a0b90ecd34c 100644 --- a/pkgs/development/libraries/physics/geant4/datasets-hook.sh +++ b/pkgs/development/libraries/physics/geant4/datasets-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash @name@ () { export G4@envvar@DATA="@datadir@" } diff --git a/pkgs/development/libraries/physics/geant4/geant4-hook.sh b/pkgs/development/libraries/physics/geant4/geant4-hook.sh index 0b775d432831b..cf1f3a76a9de4 100644 --- a/pkgs/development/libraries/physics/geant4/geant4-hook.sh +++ b/pkgs/development/libraries/physics/geant4/geant4-hook.sh @@ -1 +1,2 @@ +# shellcheck shell=bash source @out@/bin/geant4.sh From e5da554363c80a8cad11269d864e65f3e97db8a1 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:52 +1300 Subject: [PATCH 332/360] lhapdf: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/physics/lhapdf/pdfset-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/physics/lhapdf/pdfset-hook.sh b/pkgs/development/libraries/physics/lhapdf/pdfset-hook.sh index c499d370d8665..67458acca2583 100644 --- a/pkgs/development/libraries/physics/lhapdf/pdfset-hook.sh +++ b/pkgs/development/libraries/physics/lhapdf/pdfset-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash @name@ () { addToSearchPath LHAPDF_DATA_PATH "@out@" } From ae66a4b4de6d7cccbcda15f319eb8cfb656b3b8d Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:52 +1300 Subject: [PATCH 333/360] 4.8: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh b/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh index f288e99dd12ad..225378348c613 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh +++ b/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash qmakeConfigurePhase() { runHook preConfigure From dc20fdc4b8ca785a333fbf27274ed2196f4b8f46 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:53 +1300 Subject: [PATCH 334/360] 5.12: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/qt-5/5.12/fetch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/qt-5/5.12/fetch.sh b/pkgs/development/libraries/qt-5/5.12/fetch.sh index 6d2cf551dd5bc..46de27e8e4c42 100644 --- a/pkgs/development/libraries/qt-5/5.12/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.12/fetch.sh @@ -1,2 +1,3 @@ +# shellcheck shell=bash WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.10/submodules/ \ -A '*.tar.xz' ) From 353e369944f2331ef7fa7d9e4ba9ea7ec4b708ac Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:53 +1300 Subject: [PATCH 335/360] 5.14: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/libraries/qt-5/5.14/fetch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/qt-5/5.14/fetch.sh b/pkgs/development/libraries/qt-5/5.14/fetch.sh index ca0073afbbb4e..cb763a374e7c9 100644 --- a/pkgs/development/libraries/qt-5/5.14/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.14/fetch.sh @@ -1,2 +1,3 @@ +# shellcheck shell=bash WGET_ARGS=( https://download.qt.io/archive/qt/5.14/5.14.2/submodules/ \ -A '*.tar.xz' ) From c1fb99729374076f075b60c46736c8f4ec931adf Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:53 +1300 Subject: [PATCH 336/360] apache-maven: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/tools/build-managers/apache-maven/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/apache-maven/builder.sh b/pkgs/development/tools/build-managers/apache-maven/builder.sh index dcc38b9ec74a1..3add991a919f7 100644 --- a/pkgs/development/tools/build-managers/apache-maven/builder.sh +++ b/pkgs/development/tools/build-managers/apache-maven/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup unpackPhase From 08845b1cd5412eeb33085ca80c858b1decdfe8ea Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:53 +1300 Subject: [PATCH 337/360] bmake: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/tools/build-managers/bmake/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/bmake/setup-hook.sh b/pkgs/development/tools/build-managers/bmake/setup-hook.sh index c5ca27dd91050..51ae1367520bb 100644 --- a/pkgs/development/tools/build-managers/bmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/bmake/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addMakeFlags() { export prefix="$out" export MANDIR="${!outputMan}/share/man" From e172bdf1b65928ed360996904236733969abe854 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:53 +1300 Subject: [PATCH 338/360] boot: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/tools/build-managers/boot/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/boot/builder.sh b/pkgs/development/tools/build-managers/boot/builder.sh index c1481dc6a1445..b1cc5696f8166 100644 --- a/pkgs/development/tools/build-managers/boot/builder.sh +++ b/pkgs/development/tools/build-managers/boot/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup boot_bin=$out/bin/boot From aeadf4b9944d03dd512d7f49aa5c795beaba56e5 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:53 +1300 Subject: [PATCH 339/360] build2: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/tools/build-managers/build2/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/build2/setup-hook.sh b/pkgs/development/tools/build-managers/build2/setup-hook.sh index 16b592d3c1090..d5f0f34aafc6e 100644 --- a/pkgs/development/tools/build-managers/build2/setup-hook.sh +++ b/pkgs/development/tools/build-managers/build2/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash build2ConfigurePhase() { runHook preConfigure From 5403be99ec0e585f0cc8057768dfba5b284fb2ab Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:53 +1300 Subject: [PATCH 340/360] cmake: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/tools/build-managers/cmake/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 89e8e0e197a0b..9863ac4c3b80a 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addCMakeParams() { addToSearchPath CMAKE_PREFIX_PATH $1 } From 78e200903a80538be43a66b5c1b6989dd9df42c9 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:53 +1300 Subject: [PATCH 341/360] gn: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/tools/build-managers/gn/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/gn/setup-hook.sh b/pkgs/development/tools/build-managers/gn/setup-hook.sh index 850f18948cad9..fb0b0678ef0f6 100644 --- a/pkgs/development/tools/build-managers/gn/setup-hook.sh +++ b/pkgs/development/tools/build-managers/gn/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash gnConfigurePhase() { runHook preConfigure From 044effd8047597a9d55723d3b59f6823ef189fed Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:53 +1300 Subject: [PATCH 342/360] gprbuild: Indicate shell to ShellCheck ShellCheck SC2148. --- .../tools/build-managers/gprbuild/gpr-project-path-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh b/pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh index f98b2ab9e58d3..81e42faeb052f 100644 --- a/pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh +++ b/pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addAdaObjectsPath() { local role_post getHostRoleEnvHook From bda0159ce84fe37c5f27f7bd830f7f349a8aee43 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:53 +1300 Subject: [PATCH 343/360] meson: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/tools/build-managers/meson/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh index 3d946fcffd522..0d3145b801c7f 100644 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash mesonConfigurePhase() { runHook preConfigure From e07d5967864b1ba515096400faf6437b25217652 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:53 +1300 Subject: [PATCH 344/360] ninja: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/tools/build-managers/ninja/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/ninja/setup-hook.sh b/pkgs/development/tools/build-managers/ninja/setup-hook.sh index 7d8087ad13422..90b2da3bbd410 100644 --- a/pkgs/development/tools/build-managers/ninja/setup-hook.sh +++ b/pkgs/development/tools/build-managers/ninja/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash ninjaBuildPhase() { runHook preBuild From bb0e2c775d88526bfde6a0d22b1e3eb8e00b4063 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:53 +1300 Subject: [PATCH 345/360] scons: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/tools/build-managers/scons/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/scons/setup-hook.sh b/pkgs/development/tools/build-managers/scons/setup-hook.sh index 0b908f68286b5..d5a8910f33601 100644 --- a/pkgs/development/tools/build-managers/scons/setup-hook.sh +++ b/pkgs/development/tools/build-managers/scons/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash sconsBuildPhase() { runHook preBuild From 479df8ed6e9b36a3da3d46baca24f1666097fb26 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:53 +1300 Subject: [PATCH 346/360] wafHook: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/tools/build-managers/wafHook/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh index 6cea8fcc2ea84..b0381ac5c53fb 100644 --- a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh +++ b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash wafConfigurePhase() { runHook preConfigure From c3d3404d967f8ceb72d9778eee4fbb70158ba809 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:53 +1300 Subject: [PATCH 347/360] automake: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/tools/misc/automake/builder.sh | 1 + pkgs/development/tools/misc/automake/setup-hook.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/tools/misc/automake/builder.sh b/pkgs/development/tools/misc/automake/builder.sh index e54a2acca67e8..ec1d3bd5bdbb2 100644 --- a/pkgs/development/tools/misc/automake/builder.sh +++ b/pkgs/development/tools/misc/automake/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup # Wrap the given `aclocal' program, appending extra `-I' flags diff --git a/pkgs/development/tools/misc/automake/setup-hook.sh b/pkgs/development/tools/misc/automake/setup-hook.sh index 292632b7cbce8..25453e12ef0fc 100644 --- a/pkgs/development/tools/misc/automake/setup-hook.sh +++ b/pkgs/development/tools/misc/automake/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash addAclocals () { addToSearchPathWithCustomDelimiter : ACLOCAL_PATH $1/share/aclocal } From 76b28e20b0573a00e030b4140474371320c33763 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:54 +1300 Subject: [PATCH 348/360] luarocks: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/tools/misc/luarocks/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/luarocks/setup-hook.sh b/pkgs/development/tools/misc/luarocks/setup-hook.sh index 587d5413c3edd..fb4f2150d022f 100644 --- a/pkgs/development/tools/misc/luarocks/setup-hook.sh +++ b/pkgs/development/tools/misc/luarocks/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash unpackCmdHooks+=(_trySourceRock) unpackCmdHooks+=(_tryRockSpec) From 9d77b81f1a3de861500197437c28dbff58d977c8 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:54 +1300 Subject: [PATCH 349/360] patchelf: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/tools/misc/patchelf/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/patchelf/setup-hook.sh b/pkgs/development/tools/misc/patchelf/setup-hook.sh index 576b9ca2103ec..5a7ddc3768677 100644 --- a/pkgs/development/tools/misc/patchelf/setup-hook.sh +++ b/pkgs/development/tools/misc/patchelf/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash # This setup hook calls patchelf to automatically remove unneeded # directories from the RPATH of every library or executable in every # output. From b676c03a1d513b0dd2feb87a17df57b4df6bd76b Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:54 +1300 Subject: [PATCH 350/360] premake: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/tools/misc/premake/setup-hook.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/premake/setup-hook.sh b/pkgs/development/tools/misc/premake/setup-hook.sh index 6e65e9e8c73f1..3199f97ce5665 100644 --- a/pkgs/development/tools/misc/premake/setup-hook.sh +++ b/pkgs/development/tools/misc/premake/setup-hook.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash premakeConfigurePhase() { runHook preConfigure From 7295f315200c412aacf60e75f8866b998c67d6f1 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:54 +1300 Subject: [PATCH 351/360] antlr: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/development/tools/parsing/antlr/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/parsing/antlr/builder.sh b/pkgs/development/tools/parsing/antlr/builder.sh index b8e7791b6fc9b..4dae3f9e00b24 100644 --- a/pkgs/development/tools/parsing/antlr/builder.sh +++ b/pkgs/development/tools/parsing/antlr/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup tar zxvf $src From b0cd3017f432f92a50fb31b780a1a9d7d780e1b5 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:54 +1300 Subject: [PATCH 352/360] xorg-sys: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/os-specific/linux/opengl/xorg-sys/builder.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh index cd21899e60e7d..7ede1c3517bae 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh +++ b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup mkdir -p $out/lib @@ -11,6 +12,3 @@ ln -s /usr/lib/tls/libnvidia-tls.so.1 $out/lib/ for i in $neededLibs; do ln -s $i/lib/*.so* $out/lib/ done - - - From ed4c3c7d3a6c53393d23a22433c0016f84700109 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:37:54 +1300 Subject: [PATCH 353/360] axis2: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/servers/http/tomcat/axis2/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/http/tomcat/axis2/builder.sh b/pkgs/servers/http/tomcat/axis2/builder.sh index 2e36367e9dcf5..ebb96d2eb6c23 100644 --- a/pkgs/servers/http/tomcat/axis2/builder.sh +++ b/pkgs/servers/http/tomcat/axis2/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup unzip $src From 7c3a4fe60dbb5b988a4aa8274568f9ba39267dae Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:38:32 +1300 Subject: [PATCH 354/360] azure-new: Indicate shell to ShellCheck ShellCheck SC2148. --- nixos/maintainers/scripts/azure-new/common.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/maintainers/scripts/azure-new/common.sh b/nixos/maintainers/scripts/azure-new/common.sh index eb87c3e065019..ee1653d33877a 100644 --- a/nixos/maintainers/scripts/azure-new/common.sh +++ b/nixos/maintainers/scripts/azure-new/common.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash export group="${AZURE_RESOURCE_GROUP:-"azure"}" export location="${AZURE_LOCATION:-"westus2"}" From bff3b9b305bc0e4d2aa053f0f6de538e2551efa4 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:38:43 +1300 Subject: [PATCH 355/360] ircd-hybrid: Indicate shell to ShellCheck ShellCheck SC2148. --- nixos/modules/services/networking/ircd-hybrid/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/ircd-hybrid/builder.sh b/nixos/modules/services/networking/ircd-hybrid/builder.sh index 38312210df251..8b052739a9253 100644 --- a/nixos/modules/services/networking/ircd-hybrid/builder.sh +++ b/nixos/modules/services/networking/ircd-hybrid/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup doSub() { From 1ff4a97c65440abeb365d46c1e00a5e4d1550e7c Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:38:52 +1300 Subject: [PATCH 356/360] jboss: Indicate shell to ShellCheck ShellCheck SC2148. --- nixos/modules/services/web-servers/jboss/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-servers/jboss/builder.sh b/nixos/modules/services/web-servers/jboss/builder.sh index 0e5af324c13fe..86e21823dc052 100644 --- a/nixos/modules/services/web-servers/jboss/builder.sh +++ b/nixos/modules/services/web-servers/jboss/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash set -e source $stdenv/setup From 048f1d0bca995a9039a7e6639eb3b1aab530caef Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:39:01 +1300 Subject: [PATCH 357/360] tasks: Indicate shell to ShellCheck ShellCheck SC2148. --- nixos/modules/tasks/tty-backgrounds-combine.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/tasks/tty-backgrounds-combine.sh b/nixos/modules/tasks/tty-backgrounds-combine.sh index 55c3a1ebfa8ab..fbbcaae803fb3 100644 --- a/nixos/modules/tasks/tty-backgrounds-combine.sh +++ b/nixos/modules/tasks/tty-backgrounds-combine.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup ttys=($ttys) From 77a86f8fc564656d0ab78098c97df94613f95dce Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:39:12 +1300 Subject: [PATCH 358/360] yarn2nix-moretea: Indicate shell to ShellCheck ShellCheck SC2148. --- .../tools/yarn2nix-moretea/yarn2nix/nix/expectShFunctions.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/nix/expectShFunctions.sh b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/nix/expectShFunctions.sh index fad230c69212b..3772cf8160de7 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/nix/expectShFunctions.sh +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/nix/expectShFunctions.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash expectFilePresent () { if [ -f "$1" ]; then echo "Test passed: file is present - $1" From a824d55c2eda762cb0f81a7781d527d17188b442 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:39:24 +1300 Subject: [PATCH 359/360] cups: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh b/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh index f750df6e50639..cd309d449db7d 100644 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh +++ b/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source $stdenv/setup arch=$(uname -m) From 0157c178c7efaf8f4b3c6a0fa0901d375ee96ccd Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 19 Nov 2021 22:39:47 +1300 Subject: [PATCH 360/360] zsh: Indicate shell to ShellCheck ShellCheck SC2148. --- pkgs/shells/zsh/zsh-clipboard/clipboard.plugin.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/shells/zsh/zsh-clipboard/clipboard.plugin.zsh b/pkgs/shells/zsh/zsh-clipboard/clipboard.plugin.zsh index f1f190ec70c33..303c2ae67e855 100644 --- a/pkgs/shells/zsh/zsh-clipboard/clipboard.plugin.zsh +++ b/pkgs/shells/zsh/zsh-clipboard/clipboard.plugin.zsh @@ -1,3 +1,4 @@ +# shellcheck shell=bash _cb-yank() { AA=$(clippaste 2>/dev/null) && CUTBUFFER="$AA" zle yank