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

This commit is contained in:
Sandro 2021-11-26 12:19:32 +01:00 committed by GitHub
commit 8efe977574
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 deletions

View file

@ -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[@]}"

View file

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

View file

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

View file

@ -1,4 +1,5 @@
#! @runtimeShell@
# shellcheck shell=bash
case "$1" in
-h|--help)