make-targets: shellcheck

It was choking on more complicated machine expressions

Author: ghudgins

make-targets.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i bash ./shell.nix
+# shellcheck shell=bash
 
 set -eux
 set -o pipefail
@@ -48,15 +49,16 @@ sshwrap() (
 )
 
 cfg_for_provisioner() (
-  provisioner=$1
-  ip=$2
+  local provisioner=$1
+  local name=$2
+  local ip=$3
 
   case "$provisioner" in
     "metal")
-      cfg_for_metal "$ip"
+      cfg_for_metal "$name" "$ip"
       ;;
     "nixos-install")
-      cfg_for_nixos_install "$ip"
+      cfg_for_nixos_install "$name" "$ip"
       ;;
     *)
       echo "Failed: no such provisioner: $provisioner"
@@ -66,16 +68,37 @@ cfg_for_provisioner() (
 )
 
 cfg_for_metal() (
+  local name=$1
+  local ip=$2
   sshwrap "root@$ip" -- cat /etc/nixos/packet/system.nix > "$scratch/machines/${name}.system.nix"
 )
 
 cfg_for_nixos_install() (
+  local name=$1
+  local ip=$2
+
   mkdir -p "$scratch/machines/${name}"
   sshwrap "root@$ip" -- cat /etc/nixos/configuration.nix > "$scratch/machines/${name}/configuration.nix"
   sshwrap "root@$ip" -- cat /etc/nixos/hardware-configuration.nix > "$scratch/machines/${name}/hardware-configuration.nix"
   printf '{ imports = [ %s ]; }' "./${name}/configuration.nix" >  "$scratch/machines/${name}.system.nix"
 )
 
+import_machine() (
+  local machine=$1
+
+  local name
+  name="$(jq -r .key <<<"$machine")"
+  local ip
+  ip="$(jq -r .value.ip <<<"$machine")"
+  local provisioner
+  provisioner=$(jq -r .value.provisioner <<<"$machine")
+  jq -r .value.expression <<<"$machine"
+  jq -r .value.expression <<<"$machine" > "$scratch/machines/${name}.expr.nix"
+  if cfg_for_provisioner "$provisioner" "$name" "$ip"; then
+    networkentry "$name" "$ip" >> "$scratch/default.nix"
+  fi
+)
+
 cat <<EOF > "$scratch/default.nix"
 {
   network = {
@@ -96,17 +119,8 @@ cat <<EOF > "$scratch/default.nix"
 
 EOF
 
-machines | while read machine; do
-   (
-        name="$(jq -r .key <<<"$machine")"
-        ip=$(jq -r .value.ip <<<"$machine")
-        provisioner=$(jq -r .value.provisioner <<<"$machine")
-        jq -r .value.expression <<<"$machine"
-        jq -r .value.expression <<<"$machine" > "$scratch/machines/${name}.expr.nix"
-        if cfg_for_provisioner "$provisioner" "$ip"; then
-          networkentry "$name" "$ip" >> "$scratch/default.nix"
-        fi
-   ) < /dev/null
+machines | while read -r machine; do
+   import_machine "$machine" < /dev/null
 done
 
 echo "}" >> "$scratch/default.nix"

morph-network/machines/macofborg1.expr.nix

@@ -1 +1,14 @@
-{ }
+{
+  roles.darwin-builder.enable = true;
+  services.ofborg.macos_vm.version = "catalina";
+  macosGuest = {
+    guest = {
+      sockets = 1;
+      cores = 4;
+      threads = 1;
+      memoryInMegs = 13 * 1024;
+    };
+    network.externalInterface = "ens1";
+  };
+}
+

shell.nix

@@ -1,16 +1,12 @@
 let
   sources = import ./nix/sources.nix;
-  overlay = _: pkgs: {
-  };
+  overlay = _: pkgs: { };
 
   pkgs = import sources.nixpkgs {
     overlays = [ overlay ];
-    config = {
-      allowUnfree = true;
-    };
+    config = { allowUnfree = true; };
   };
-in
-pkgs.mkShell {
+in pkgs.mkShell {
   buildInputs = [
     pkgs.coreutils
     pkgs.jq
@@ -21,6 +17,7 @@ pkgs.mkShell {
     pkgs.bashInteractive
     pkgs.git
     pkgs.morph
+    pkgs.shellcheck
     (pkgs.terraform_0_14.withPlugins (p: [
       (pkgs.buildGoModule rec {
         pname = "terraform-provider-cloudamqp";