diff options
Diffstat (limited to 'spack.env.sh.patch')
| -rw-r--r-- | spack.env.sh.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/spack.env.sh.patch b/spack.env.sh.patch index 405257d54140..750d5508f05f 100644 --- a/spack.env.sh.patch +++ b/spack.env.sh.patch @@ -38,7 +38,7 @@ else case $_sp_arg in activate) -@@ -133,10 +137,10 @@ +@@ -132,10 +136,10 @@ [ "${_a#* --help}" != "$_a" ]; then # No args or args contain --sh, --csh, or -h/--help: just execute. @@ -46,12 +46,12 @@ + _pkexec_env env activate "$@" else # Actual call to activate: source the output. -- stdout="$(command spack $_sp_flags env activate --sh "$@")" || return -+ stdout="$(_pkexec_env $_sp_flags env activate --sh "$@")" || return +- stdout="$(SPACK_COLOR="${SPACK_COLOR:-always}" command spack $_sp_flags env activate --sh "$@")" || return ++ stdout="$(SPACK_COLOR="${SPACK_COLOR:-always}" _pkexec_env $_sp_flags env activate --sh "$@")" || return eval "$stdout" fi ;; -@@ -152,18 +156,18 @@ +@@ -151,18 +155,18 @@ [ "${_a#* --csh}" != "$_a" ]; then # Args contain --sh or --csh: just execute. @@ -63,8 +63,8 @@ + _pkexec_env env deactivate -h else # No args: source the output of the command. -- stdout="$(command spack $_sp_flags env deactivate --sh)" || return -+ stdout="$(_pkexec_env $_sp_flags env deactivate --sh)" || return +- stdout="$(SPACK_COLOR="${SPACK_COLOR:-always}" command spack $_sp_flags env deactivate --sh)" || return ++ stdout="$(SPACK_COLOR="${SPACK_COLOR:-always}" _pkexec_env $_sp_flags env deactivate --sh)" || return eval "$stdout" fi ;; @@ -74,15 +74,15 @@ ;; esac fi -@@ -184,14 +188,14 @@ +@@ -183,14 +187,14 @@ [ "${_a#* --help}" != "$_a" ]; then # Args contain --sh, --csh, or -h/--help: just execute. - command spack $_sp_flags $_sp_subcommand "$@" + _pkexec_env $_sp_flags $_sp_subcommand "$@" else -- stdout="$(command spack $_sp_flags $_sp_subcommand --sh "$@")" || return -+ stdout="$(_pkexec_env $_sp_flags $_sp_subcommand --sh "$@")" || return +- stdout="$(SPACK_COLOR="${SPACK_COLOR:-always}" command spack $_sp_flags $_sp_subcommand --sh "$@")" || return ++ stdout="$(SPACK_COLOR="${SPACK_COLOR:-always}" _pkexec_env $_sp_flags $_sp_subcommand --sh "$@")" || return eval "$stdout" fi ;; @@ -92,7 +92,7 @@ ;; esac } -@@ -366,7 +370,7 @@ +@@ -365,7 +369,7 @@ _spack_pathadd PATH "${_sp_module_bin}" fi; else |