Merge pull request #34 from PatrickDaG/main

fix: Actually print subcommand help
oddlama · Jul 15, 2024 · d638987 · d638987
2 parents c071067 + 269b1a6
commit d638987
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/nix/package.nix b/nix/package.nix
@@ -50,8 +50,13 @@ writeShellScriptBin "agenix" ''
   while [[ $# -gt 0 ]]; do
     case "$1" in
       "help"|"--help"|"-help"|"-h")
-        show_help
-        exit 1
+        if [[ "$APP" == "" ]]; then
+          show_help
+          exit 1
+        else
+          PASS_THRU_ARGS+=("$1")
+          shift
+        fi
         ;;
       "--show-trace")
         # It is potentially desirable to use --show-trace in the subcommand as
@@ -76,7 +81,8 @@ writeShellScriptBin "agenix" ''
     esac
   done
   if [[ "$APP" == "" ]]; then
-    die "Error: No app provided.  Exiting."
+    show_help
+    exit 1
   fi
   echo "Collecting information about hosts. This may take a while..."
   exec nix run $SHOW_TRACE_ARG \