Merge pull request #147456 from l0b0/de-lint-installer-scripts

2021-11-26 12:19:32 +01:00
parent e23f671f36 e0f1682910
commit 8efe977574
4 changed files with 7 additions and 3 deletions
@@ -1,4 +1,5 @@
 #! @runtimeShell@ -e
+# shellcheck shell=bash

 # Shows the usage of this command to the user

@@ -29,12 +30,12 @@ while [ $# -gt 0 ]; do
        nixBuildArgs+=("--option" "$1" "$2"); shift
        ;;
      *)
-        if [ ! -z "$networkExpr" ]; then
+        if [ -n "$networkExpr" ]; then
          echo "Network expression already set!"
          showUsage
          exit 1
        fi
-        networkExpr="$(readlink -f $1)"
+        networkExpr="$(readlink -f "$1")"
        ;;
    esac

@@ -49,4 +50,4 @@ fi

 # Build a network of VMs
 nix-build '<nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \
-    --argstr networkExpr $networkExpr "${nixBuildArgs[@]}"
+    --argstr networkExpr "$networkExpr" "${nixBuildArgs[@]}"
@@ -1,4 +1,5 @@
 #! @runtimeShell@
+# shellcheck shell=bash

 set -e

@@ -1,4 +1,5 @@
 #! @runtimeShell@
+# shellcheck shell=bash

 set -e
 shopt -s nullglob
@@ -1,4 +1,5 @@
 #! @runtimeShell@
+# shellcheck shell=bash

 case "$1" in
  -h|--help)