containers: fix run_args for devenv.nix

Author: nazarewk

src/devenv-devShell.sh

@@ -32,6 +32,9 @@ Options:
   --podman-run                              Execute `podman run`.
 ' : "$@")"
 
+  local run_args=()
+  eval "$(docopt_get_eval_array args '<run-args>' run_args)"
+
   local registry="${args['--registry']}"
   local copy_args=()
 
@@ -50,13 +53,10 @@ Options:
     # shellcheck disable=SC2086
     nix run "${app_prefix}-copy-to" -- --registry "${registry}" "${copy_args[@]}" ${args['--copy-args']}
   fi
-  eval "$(docopt_get_eval_array args '<run-args>' run_args)"
 
   if [[ "${args['--docker-run']}" != false ]]; then
-    # shellcheck disable=SC2154
     nix run "${app_prefix}-docker-run" -- "${run_args[@]}"
   elif [[ "${args['--podman-run']}" != false ]]; then
-    # shellcheck disable=SC2154
     nix run "${app_prefix}-podman-run" -- "${run_args[@]}"
   fi
 }

src/devenv.nix

@@ -116,7 +116,11 @@ pkgs.writeScriptBin "devenv" ''
   EOF
       )
 
+      # shellcheck disable=SC1090
+      source "$(command -v docopts.sh)"
       eval "$(${pkgs.docopts}/bin/docopts -A subcommand -h "$help" : "$@")"
+      local run_args=()
+      eval "$(docopt_get_eval_array args '<run-args>' run_args)"
 
       export DEVENV_CONTAINER=1
       container="''${subcommand[CONTAINER-NAME]}"
@@ -146,13 +150,9 @@ pkgs.writeScriptBin "devenv" ''
       fi
 
       if [[ ''${subcommand[--docker-run]} != false ]]; then
-        # shellcheck disable=SC1090
-        source "$(command -v docopts.sh)"
-        $($CUSTOM_NIX/bin/nix $NIX_FLAGS build --print-out-paths --no-link --impure ".#devenv.containers.\"$container\".dockerRun") -- $(docopt_get_values subcommand '<run-args>')
-      if [[ ''${subcommand[--podman-run]} != false ]]; then
-        # shellcheck disable=SC1090
-        source "$(command -v docopts.sh)"
-        $($CUSTOM_NIX/bin/nix $NIX_FLAGS build --print-out-paths --no-link --impure ".#devenv.containers.\"$container\".podmanRun") -- $(docopt_get_values subcommand '<run-args>')
+        $($CUSTOM_NIX/bin/nix $NIX_FLAGS build --print-out-paths --no-link --impure ".#devenv.containers.\"$container\".dockerRun") -- "''${run_args[@]}"
+      elif [[ ''${subcommand[--podman-run]} != false ]]; then
+        $($CUSTOM_NIX/bin/nix $NIX_FLAGS build --print-out-paths --no-link --impure ".#devenv.containers.\"$container\".podmanRun") -- "''${run_args[@]}"
       fi
       ;;
     search)