Merge pull request #421 from mexisme/fix/diskSize-type/convert-explicitly

fix: Make sure the "--disk-size" arg is correctly interpreted as an int by Nix, when an int is provided

Author: Mic92

nixos-generate

@@ -58,6 +58,19 @@ abort() {
   exit 1
 }
 
+# TODO: Is there a better name for this?
+fixDiskSizeFormat() {
+  # If the arg is an int, pass it back unchanged:
+  if [[ "$1" =~ ^[0-9][0-9]*$ ]]; then
+    echo "$1"
+    return
+  fi
+
+  # If the arg is _not_ an int, we'll assume it's a string.
+  # Therefore, we'll make sure it's wrapped in quotes, so its eval'd as a string by Nix:
+  echo "\"$1\""
+}
+
 ## Main ##
 
 while [[ $# -gt 0 ]]; do
@@ -81,7 +94,8 @@ while [[ $# -gt 0 ]]; do
       shift
       ;;
     --disk-size)
-      nix_build_args+=("--argstr" "diskSize" "$2")
+      # Note: make sure integers are not incorrectly interpreted as strings by Nix:
+      nix_build_args+=("--arg" "diskSize" "$(fixDiskSizeFormat "$2")")
       shift
       ;;
     --special-arg)