summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorHarmen Stoppels <harmenstoppels@gmail.com>2023-08-29 18:12:19 +0200
committerGitHub <noreply@github.com>2023-08-29 18:12:19 +0200
commit5138c71d3471f55da04fe5b1f7dcb03e2dd48866 (patch)
treec678e259c4c1fbb295b2ec12d3ea89d9ba68fd55 /share
parenteef9939c21c65f4b1da64807b1e2f120e0e8afbf (diff)
downloadspack-5138c71d3471f55da04fe5b1f7dcb03e2dd48866.tar.gz
spack-5138c71d3471f55da04fe5b1f7dcb03e2dd48866.tar.bz2
spack-5138c71d3471f55da04fe5b1f7dcb03e2dd48866.tar.xz
spack-5138c71d3471f55da04fe5b1f7dcb03e2dd48866.zip
Revert "Add style tool to fix fish file formatting (#39155)" (#39680)
This reverts commit 70c71e8f935b3c5152036a993295df13c5fe69ca.
Diffstat (limited to 'share')
-rwxr-xr-xshare/spack/setup-env.fish790
-rwxr-xr-xshare/spack/spack-completion.fish4
2 files changed, 397 insertions, 397 deletions
diff --git a/share/spack/setup-env.fish b/share/spack/setup-env.fish
index 8bb6343e5b..482c3eaa68 100755
--- a/share/spack/setup-env.fish
+++ b/share/spack/setup-env.fish
@@ -66,548 +66,548 @@ end
function spack -d "wrapper for the `spack` command"
- #
- # DEFINE SUPPORT FUNCTIONS HERE
- #
+#
+# DEFINE SUPPORT FUNCTIONS HERE
+#
- #
- # ALLOCATE_SP_SHARED, and DELETE_SP_SHARED allocate (and delete) temporary
- # global variables
- #
+#
+# ALLOCATE_SP_SHARED, and DELETE_SP_SHARED allocate (and delete) temporary
+# global variables
+#
- function allocate_sp_shared -d "allocate shared (global variables)"
- set -gx __sp_remaining_args
- set -gx __sp_subcommand_args
- set -gx __sp_module_args
- set -gx __sp_stat
- set -gx __sp_stdout
- set -gx __sp_stderr
- end
+function allocate_sp_shared -d "allocate shared (global variables)"
+ set -gx __sp_remaining_args
+ set -gx __sp_subcommand_args
+ set -gx __sp_module_args
+ set -gx __sp_stat
+ set -gx __sp_stdout
+ set -gx __sp_stderr
+end
- function delete_sp_shared -d "deallocate shared (global variables)"
- set -e __sp_remaining_args
- set -e __sp_subcommand_args
- set -e __sp_module_args
- set -e __sp_stat
- set -e __sp_stdout
- set -e __sp_stderr
- end
+function delete_sp_shared -d "deallocate shared (global variables)"
+ set -e __sp_remaining_args
+ set -e __sp_subcommand_args
+ set -e __sp_module_args
+ set -e __sp_stat
+ set -e __sp_stdout
+ set -e __sp_stderr
+end
+
+#
+# STREAM_ARGS and SHIFT_ARGS: helper functions manipulating the `argv` array:
+# -> STREAM_ARGS: echos the `argv` array element-by-element
+# -> SHIFT_ARGS: echos the `argv` array element-by-element starting with the
+# second element. If `argv` has only one element, echo the
+# empty string `""`.
+# NOTE: while `stream_args` is not strictly necessary, it adds a nice symmetry
+# to `shift_args`
+#
+function stream_args -d "echos args as a stream"
+ # return the elements of `$argv` as an array
+ # -> since we want to be able to call it as part of `set x (shift_args
+ # $x)`, we return these one-at-a-time using echo... this means that the
+ # sub-command stream will correctly concatenate the output into an array
+ for elt in $argv
+ echo $elt
+ end
+end
+
+
+function shift_args -d "simulates bash shift"
#
- # STREAM_ARGS and SHIFT_ARGS: helper functions manipulating the `argv` array:
- # -> STREAM_ARGS: echos the `argv` array element-by-element
- # -> SHIFT_ARGS: echos the `argv` array element-by-element starting with the
- # second element. If `argv` has only one element, echo the
- # empty string `""`.
- # NOTE: while `stream_args` is not strictly necessary, it adds a nice symmetry
- # to `shift_args`
+ # Returns argv[2..-1] (as an array)
+ # -> if argv has only 1 element, then returns the empty string. This
+ # simulates the behavior of bash `shift`
#
- function stream_args -d "echos args as a stream"
- # return the elements of `$argv` as an array
+ if test -z "$argv[2]"
+ # there are no more element, returning the empty string
+ echo ""
+ else
+ # return the next elements `$argv[2..-1]` as an array
# -> since we want to be able to call it as part of `set x (shift_args
- # $x)`, we return these one-at-a-time using echo... this means that the
- # sub-command stream will correctly concatenate the output into an array
- for elt in $argv
+ # $x)`, we return these one-at-a-time using echo... this means that
+ # the sub-command stream will correctly concatenate the output into
+ # an array
+ for elt in $argv[2..-1]
echo $elt
end
end
+end
- function shift_args -d "simulates bash shift"
- #
- # Returns argv[2..-1] (as an array)
- # -> if argv has only 1 element, then returns the empty string. This
- # simulates the behavior of bash `shift`
- #
- if test -z "$argv[2]"
- # there are no more element, returning the empty string
- echo ""
- else
- # return the next elements `$argv[2..-1]` as an array
- # -> since we want to be able to call it as part of `set x (shift_args
- # $x)`, we return these one-at-a-time using echo... this means that
- # the sub-command stream will correctly concatenate the output into
- # an array
- for elt in $argv[2..-1]
- echo $elt
- end
- end
- end
+
+#
+# CAPTURE_ALL: helper function used to capture stdout, stderr, and status
+# -> CAPTURE_ALL: there is a bug in fish, that prevents stderr re-capture
+# from nested command substitution:
+# https://github.com/fish-shell/fish-shell/issues/6459
+#
+
+function capture_all
+ begin;
+ begin;
+ eval $argv[1]
+ set $argv[2] $status # read sets the `status` flag => capture here
+ end 2>| read -z __err
+ end 1>| read -z __out
+
+ # output arrays
+ set $argv[3] (echo $__out | string split \n)
+ set $argv[4] (echo $__err | string split \n)
+
+ return 0
+end
+
+#
+# GET_SP_FLAGS, and GET_MOD_ARGS: support functions for extracting arguments and
+# flags. Note bash's `shift` operation is simulated by the `__sp_remaining_args`
+# array which is roughly equivalent to `$@` in bash.
+#
+function get_sp_flags -d "return leading flags"
#
- # CAPTURE_ALL: helper function used to capture stdout, stderr, and status
- # -> CAPTURE_ALL: there is a bug in fish, that prevents stderr re-capture
- # from nested command substitution:
- # https://github.com/fish-shell/fish-shell/issues/6459
+ # Accumulate initial flags for main spack command. NOTE: Sets the external
+ # array: `__sp_remaining_args` containing all unprocessed arguments.
#
- function capture_all
- begin
- begin
- eval $argv[1]
- set $argv[2] $status # read sets the `status` flag => capture here
- end 2>| read -z __err
- end 1>| read -z __out
+ # initialize argument counter
+ set -l i 1
- # output arrays
- set $argv[3] (echo $__out | string split \n)
- set $argv[4] (echo $__err | string split \n)
+ # iterate over elements (`elt`) in `argv` array
+ for elt in $argv
+
+ # match element `elt` of `argv` array to check if it has a leading dash
+ if echo $elt | string match -r -q "^-"
+ # by echoing the current `elt`, the calling stream accumulates list
+ # of valid flags. NOTE that this can also be done by adding to an
+ # array, but fish functions can only return integers, so this is the
+ # most elegant solution.
+ echo $elt
+ else
+ # bash compatibility: stop when the match first fails. Upon failure,
+ # we pack the remainder of `argv` into a global `__sp_remaining_args`
+ # array (`i` tracks the index of the next element).
+ set __sp_remaining_args (stream_args $argv[$i..-1])
+ return
+ end
+
+ # increment argument counter: used in place of bash's `shift` command
+ set -l i (math $i+1)
- return 0
end
+ # if all elements in `argv` are matched, make sure that `__sp_remaining_args`
+ # is deleted (this might be overkill...).
+ set -e __sp_remaining_args
+end
+
+#
+# CHECK_SP_FLAGS, CONTAINS_HELP_FLAGS, CHECK_ENV_ACTIVATE_FLAGS, and
+# CHECK_ENV_DEACTIVATE_FLAGS: support functions for checking arguments and flags.
+#
+function check_sp_flags -d "check spack flags for h/V flags"
#
- # GET_SP_FLAGS, and GET_MOD_ARGS: support functions for extracting arguments and
- # flags. Note bash's `shift` operation is simulated by the `__sp_remaining_args`
- # array which is roughly equivalent to `$@` in bash.
+ # Check if inputs contain h or V flags.
#
- function get_sp_flags -d "return leading flags"
- #
- # Accumulate initial flags for main spack command. NOTE: Sets the external
- # array: `__sp_remaining_args` containing all unprocessed arguments.
- #
-
- # initialize argument counter
- set -l i 1
-
- # iterate over elements (`elt`) in `argv` array
- for elt in $argv
-
- # match element `elt` of `argv` array to check if it has a leading dash
- if echo $elt | string match -r -q "^-"
- # by echoing the current `elt`, the calling stream accumulates list
- # of valid flags. NOTE that this can also be done by adding to an
- # array, but fish functions can only return integers, so this is the
- # most elegant solution.
- echo $elt
- else
- # bash compatibility: stop when the match first fails. Upon failure,
- # we pack the remainder of `argv` into a global `__sp_remaining_args`
- # array (`i` tracks the index of the next element).
- set __sp_remaining_args (stream_args $argv[$i..-1])
- return
- end
-
- # increment argument counter: used in place of bash's `shift` command
- set -l i (math $i+1)
+ # combine argument array into single string (space seperated), to be passed
+ # to regular expression matching (`string match -r`)
+ set -l _a "$argv"
+ # skip if called with blank input. Notes: [1] (cf. EOF)
+ if test -n "$_a"
+ if echo $_a | string match -r -q ".*h.*"
+ return 0
+ end
+ if echo $_a | string match -r -q ".*V.*"
+ return 0
end
-
- # if all elements in `argv` are matched, make sure that `__sp_remaining_args`
- # is deleted (this might be overkill...).
- set -e __sp_remaining_args
end
+ return 1
+end
+
- #
- # CHECK_SP_FLAGS, CONTAINS_HELP_FLAGS, CHECK_ENV_ACTIVATE_FLAGS, and
- # CHECK_ENV_DEACTIVATE_FLAGS: support functions for checking arguments and flags.
- #
+function match_flag -d "checks all combinations of flags ocurring inside of a string"
- function check_sp_flags -d "check spack flags for h/V flags"
- #
- # Check if inputs contain h or V flags.
- #
+ # Remove leading and trailing spaces -- but we need to insert a "guard" (x)
+ # so that eg. `string trim -h` doesn't trigger the help string for `string trim`
+ set -l _a (string sub -s 2 (string trim "x$argv[1]"))
+ set -l _b (string sub -s 2 (string trim "x$argv[2]"))
- # combine argument array into single string (space seperated), to be passed
- # to regular expression matching (`string match -r`)
- set -l _a "$argv"
+ if test -z "$_a"; or test -z "$_b"
+ return 0
+ end
- # skip if called with blank input. Notes: [1] (cf. EOF)
- if test -n "$_a"
- if echo $_a | string match -r -q ".*h.*"
- return 0
- end
- if echo $_a | string match -r -q ".*V.*"
- return 0
- end
- end
+ # surrounded by spaced
+ if echo "$_a" | string match -r -q " +$_b +"
+ return 0
+ end
+
+ # beginning of string + trailing space
+ if echo "$_a" | string match -r -q "^$_b +"
+ return 0
+ end
+
+ # end of string + leadingg space
+ if echo "$_a" | string match -r -q " +$_b\$"
+ return 0
+ end
- return 1
+ # entire string
+ if echo "$_a" | string match -r -q "^$_b\$"
+ return 0
end
+ return 1
+end
+
+
+
+function check_env_activate_flags -d "check spack env subcommand flags for -h, --sh, --csh, or --fish"
+ #
+ # Check if inputs contain -h/--help, --sh, --csh, or --fish
+ #
- function match_flag -d "checks all combinations of flags ocurring inside of a string"
+ # combine argument array into single string (space seperated), to be passed
+ # to regular expression matching (`string match -r`)
+ set -l _a "$argv"
- # Remove leading and trailing spaces -- but we need to insert a "guard" (x)
- # so that eg. `string trim -h` doesn't trigger the help string for `string trim`
- set -l _a (string sub -s 2 (string trim "x$argv[1]"))
- set -l _b (string sub -s 2 (string trim "x$argv[2]"))
+ # skip if called with blank input. Notes: [1] (cf. EOF)
+ if test -n "$_a"
- if test -z "$_a"; or test -z "$_b"
+ # looks for a single `-h`
+ if match_flag $_a "-h"
return 0
end
- # surrounded by spaced
- if echo "$_a" | string match -r -q " +$_b +"
+ # looks for a single `--help`
+ if match_flag $_a "--help"
return 0
end
- # beginning of string + trailing space
- if echo "$_a" | string match -r -q "^$_b +"
+ # looks for a single `--sh`
+ if match_flag $_a "--sh"
return 0
end
- # end of string + leadingg space
- if echo "$_a" | string match -r -q " +$_b\$"
+ # looks for a single `--csh`
+ if match_flag $_a "--csh"
return 0
end
- # entire string
- if echo "$_a" | string match -r -q "^$_b\$"
+ # looks for a single `--fish`
+ if match_flag $_a "--fish"
return 0
end
- return 1
+ # looks for a single `--list`
+ if match_flag $_a "--list"
+ return 0
+ end
end
+ return 1
+end
- function check_env_activate_flags -d "check spack env subcommand flags for -h, --sh, --csh, or --fish"
- #
- # Check if inputs contain -h/--help, --sh, --csh, or --fish
- #
-
- # combine argument array into single string (space seperated), to be passed
- # to regular expression matching (`string match -r`)
- set -l _a "$argv"
-
- # skip if called with blank input. Notes: [1] (cf. EOF)
- if test -n "$_a"
-
- # looks for a single `-h`
- if match_flag $_a -h
- return 0
- end
-
- # looks for a single `--help`
- if match_flag $_a --help
- return 0
- end
+function check_env_deactivate_flags -d "check spack env subcommand flags for --sh, --csh, or --fish"
+ #
+ # Check if inputs contain --sh, --csh, or --fish
+ #
- # looks for a single `--sh`
- if match_flag $_a --sh
- return 0
- end
+ # combine argument array into single string (space seperated), to be passed
+ # to regular expression matching (`string match -r`)
+ set -l _a "$argv"
- # looks for a single `--csh`
- if match_flag $_a --csh
- return 0
- end
+ # skip if called with blank input. Notes: [1] (cf. EOF)
+ if test -n "$_a"
- # looks for a single `--fish`
- if match_flag $_a --fish
- return 0
- end
+ # looks for a single `--sh`
+ if match_flag $_a "--sh"
+ return 0
+ end
- # looks for a single `--list`
- if match_flag $_a --list
- return 0
- end
+ # looks for a single `--csh`
+ if match_flag $_a "--csh"
+ return 0
+ end
+ # looks for a single `--fish`
+ if match_flag $_a "--fish"
+ return 0
end
- return 1
end
+ return 1
+end
- function check_env_deactivate_flags -d "check spack env subcommand flags for --sh, --csh, or --fish"
- #
- # Check if inputs contain --sh, --csh, or --fish
- #
-
- # combine argument array into single string (space seperated), to be passed
- # to regular expression matching (`string match -r`)
- set -l _a "$argv"
- # skip if called with blank input. Notes: [1] (cf. EOF)
- if test -n "$_a"
- # looks for a single `--sh`
- if match_flag $_a --sh
- return 0
- end
- # looks for a single `--csh`
- if match_flag $_a --csh
- return 0
- end
+#
+# SPACK RUNNER function, this does all the work!
+#
- # looks for a single `--fish`
- if match_flag $_a --fish
- return 0
- end
+function spack_runner -d "Runner function for the `spack` wrapper"
+ # Store DYLD_* variables from spack shell function
+ # This is necessary because MacOS System Integrity Protection clears
+ # variables that affect dyld on process start.
+ for var in DYLD_LIBRARY_PATH DYLD_FALLBACK_LIBRARY_PATH
+ if set -q $var
+ set -gx SPACK_$var $$var
end
-
- return 1
end
-
-
-
#
- # SPACK RUNNER function, this does all the work!
+ # Accumulate initial flags for main spack command
#
+ set __sp_remaining_args # remaining (unparsed) arguments
+ set -l sp_flags (get_sp_flags $argv) # sets __sp_remaining_args
- function spack_runner -d "Runner function for the `spack` wrapper"
- # Store DYLD_* variables from spack shell function
- # This is necessary because MacOS System Integrity Protection clears
- # variables that affect dyld on process start.
- for var in DYLD_LIBRARY_PATH DYLD_FALLBACK_LIBRARY_PATH
- if set -q $var
- set -gx SPACK_$var $$var
- end
- end
-
- #
- # Accumulate initial flags for main spack command
- #
- set __sp_remaining_args # remaining (unparsed) arguments
- set -l sp_flags (get_sp_flags $argv) # sets __sp_remaining_args
+ #
+ # h and V flags don't require further output parsing.
+ #
+ if check_sp_flags $sp_flags
+ command spack $sp_flags $__sp_remaining_args
+ return
+ end
- #
- # h and V flags don't require further output parsing.
- #
-
- if check_sp_flags $sp_flags
- command spack $sp_flags $__sp_remaining_args
- return
- end
+ #
+ # Isolate subcommand and subcommand specs. Notes: [1] (cf. EOF)
+ #
- #
- # Isolate subcommand and subcommand specs. Notes: [1] (cf. EOF)
- #
+ set -l sp_subcommand ""
- set -l sp_subcommand ""
+ if test -n "$__sp_remaining_args[1]"
+ set sp_subcommand $__sp_remaining_args[1]
+ set __sp_remaining_args (shift_args $__sp_remaining_args) # simulates bash shift
+ end
- if test -n "$__sp_remaining_args[1]"
- set sp_subcommand $__sp_remaining_args[1]
- set __sp_remaining_args (shift_args $__sp_remaining_args) # simulates bash shift
- end
+ set -l sp_spec $__sp_remaining_args
- set -l sp_spec $__sp_remaining_args
+ #
+ # Filter out cd, env, and load and unload. For any other commands, just run
+ # the spack command as is.
+ #
- #
- # Filter out cd, env, and load and unload. For any other commands, just run
- # the spack command as is.
- #
+ switch $sp_subcommand
- switch $sp_subcommand
+ # CASE: spack subcommand is `cd`: if the sub command arg is `-h`, nothing
+ # further needs to be done. Otherwise, test the location referring the
+ # subcommand and cd there (if it exists).
- # CASE: spack subcommand is `cd`: if the sub command arg is `-h`, nothing
- # further needs to be done. Otherwise, test the location referring the
- # subcommand and cd there (if it exists).
+ case "cd"
- case cd
+ set -l sp_arg ""
- set -l sp_arg ""
+ # Extract the first subcommand argument. Notes: [1] (cf. EOF)
+ if test -n "$__sp_remaining_args[1]"
+ set sp_arg $__sp_remaining_args[1]
+ set __sp_remaining_args (shift_args $__sp_remaining_args) # simulates bash shift
+ end
- # Extract the first subcommand argument. Notes: [1] (cf. EOF)
- if test -n "$__sp_remaining_args[1]"
- set sp_arg $__sp_remaining_args[1]
- set __sp_remaining_args (shift_args $__sp_remaining_args) # simulates bash shift
- end
+ # Notes: [2] (cf. EOF)
+ if test "x$sp_arg" = "x-h"; or test "x$sp_arg" = "x--help"
+ # nothing more needs to be done for `-h` or `--help`
+ command spack cd -h
+ return
+ else
+ # extract location using the subcommand (fish `(...)`)
+ set -l LOC (command spack location $sp_arg $__sp_remaining_args)
- # Notes: [2] (cf. EOF)
- if test "x$sp_arg" = x-h; or test "x$sp_arg" = x--help
- # nothing more needs to be done for `-h` or `--help`
- command spack cd -h
+ # test location and cd if exists:
+ if test -d "$LOC"
+ cd $LOC
return
else
- # extract location using the subcommand (fish `(...)`)
- set -l LOC (command spack location $sp_arg $__sp_remaining_args)
-
- # test location and cd if exists:
- if test -d "$LOC"
- cd $LOC
- return
- else
- return 1
- end
-
+ return 1
end
+ end
- # CASE: spack subcommand is `env`. Here we get the spack runtime to
- # supply the appropriate shell commands for setting the environment
- # varibles. These commands are then run by fish (using the `capture_all`
- # function, instead of a command substitution).
- case env
+ # CASE: spack subcommand is `env`. Here we get the spack runtime to
+ # supply the appropriate shell commands for setting the environment
+ # varibles. These commands are then run by fish (using the `capture_all`
+ # function, instead of a command substitution).
- set -l sp_arg ""
+ case "env"
- # Extract the first subcommand argument. Notes: [1] (cf. EOF)
- if test -n "$__sp_remaining_args[1]"
- set sp_arg $__sp_remaining_args[1]
- set __sp_remaining_args (shift_args $__sp_remaining_args) # simulates bash shift
- end
+ set -l sp_arg ""
- # Notes: [2] (cf. EOF)
- if test "x$sp_arg" = x-h; or test "x$sp_arg" = x--help
- # nothing more needs to be done for `-h` or `--help`
- command spack env -h
- return
- else
- switch $sp_arg
- case activate
- set -l _a (stream_args $__sp_remaining_args)
-
- if check_env_activate_flags $_a
- # no args or args contain -h/--help, --sh, or --csh: just execute
- command spack env activate $_a
- return
- else
- # actual call to activate: source the output
- set -l sp_env_cmd "command spack $sp_flags env activate --fish $__sp_remaining_args"
- capture_all $sp_env_cmd __sp_stat __sp_stdout __sp_stderr
- eval $__sp_stdout
- if test -n "$__sp_stderr"
- echo -s \n$__sp_stderr 1>&2 # current fish bug: handle stderr manually
- end
- return $__sp_stat
+ # Extract the first subcommand argument. Notes: [1] (cf. EOF)
+ if test -n "$__sp_remaining_args[1]"
+ set sp_arg $__sp_remaining_args[1]
+ set __sp_remaining_args (shift_args $__sp_remaining_args) # simulates bash shift
+ end
+
+ # Notes: [2] (cf. EOF)
+ if test "x$sp_arg" = "x-h"; or test "x$sp_arg" = "x--help"
+ # nothing more needs to be done for `-h` or `--help`
+ command spack env -h
+ return
+ else
+ switch $sp_arg
+ case "activate"
+ set -l _a (stream_args $__sp_remaining_args)
+
+ if check_env_activate_flags $_a
+ # no args or args contain -h/--help, --sh, or --csh: just execute
+ command spack env activate $_a
+ return
+ else
+ # actual call to activate: source the output
+ set -l sp_env_cmd "command spack $sp_flags env activate --fish $__sp_remaining_args"
+ capture_all $sp_env_cmd __sp_stat __sp_stdout __sp_stderr
+ eval $__sp_stdout
+ if test -n "$__sp_stderr"
+ echo -s \n$__sp_stderr 1>&2 # current fish bug: handle stderr manually
end
+ return $__sp_stat
+ end
- case deactivate
- set -l _a (stream_args $__sp_remaining_args)
-
- if check_env_deactivate_flags $_a
- # just execute the command if --sh, --csh, or --fish are provided
- command spack env deactivate $_a
- return
-
- # Test of further (unparsed arguments). Any other
- # arguments are an error or help, so just run help
- # -> TODO: This should throw and error but leave as is
- # for compatibility with setup-env.sh
- # -> Notes: [1] (cf. EOF).
- else if test -n "$__sp_remaining_args"
- command spack env deactivate -h
- return
- else
- # no args: source the output of the command
- set -l sp_env_cmd "command spack $sp_flags env deactivate --fish"
- capture_all $sp_env_cmd __sp_stat __sp_stdout __sp_stderr
- if test $__sp_stat -ne 0
- if test -n "$__sp_stderr"
- echo -s \n$__sp_stderr 1>&2 # current fish bug: handle stderr manually
- end
- return $__sp_stat
+ case "deactivate"
+ set -l _a (stream_args $__sp_remaining_args)
+
+ if check_env_deactivate_flags $_a
+ # just execute the command if --sh, --csh, or --fish are provided
+ command spack env deactivate $_a
+ return
+
+ # Test of further (unparsed arguments). Any other
+ # arguments are an error or help, so just run help
+ # -> TODO: This should throw and error but leave as is
+ # for compatibility with setup-env.sh
+ # -> Notes: [1] (cf. EOF).
+ else if test -n "$__sp_remaining_args"
+ command spack env deactivate -h
+ return
+ else
+ # no args: source the output of the command
+ set -l sp_env_cmd "command spack $sp_flags env deactivate --fish"
+ capture_all $sp_env_cmd __sp_stat __sp_stdout __sp_stderr
+ if test $__sp_stat -ne 0
+ if test -n "$__sp_stderr"
+ echo -s \n$__sp_stderr 1>&2 # current fish bug: handle stderr manually
end
- eval $__sp_stdout
+ return $__sp_stat
end
+ eval $__sp_stdout
+ end
- case "*"
- # if $__sp_remaining_args is empty, then don't include it
- # as argument (otherwise it will be confused as a blank
- # string input!)
- if test -n "$__sp_remaining_args"
- command spack env $sp_arg $__sp_remaining_args
- return
- else
- command spack env $sp_arg
- return
- end
- end
+ case "*"
+ # if $__sp_remaining_args is empty, then don't include it
+ # as argument (otherwise it will be confused as a blank
+ # string input!)
+ if test -n "$__sp_remaining_args"
+ command spack env $sp_arg $__sp_remaining_args
+ return
+ else
+ command spack env $sp_arg
+ return
+ end
end
+ end
- # CASE: spack subcommand is either `load`, or `unload`. These statements
- # deal with the technical details of actually using modules. Especially
- # to deal with the substituting latest version numbers to the module
- # command.
+ # CASE: spack subcommand is either `load`, or `unload`. These statements
+ # deal with the technical details of actually using modules. Especially
+ # to deal with the substituting latest version numbers to the module
+ # command.
- case load or unload
+ case "load" or "unload"
- set -l _a (stream_args $__sp_remaining_args)
+ set -l _a (stream_args $__sp_remaining_args)
- if check_env_activate_flags $_a
- # no args or args contain -h/--help, --sh, or --csh: just execute
- command spack $sp_flags $sp_subcommand $__sp_remaining_args
- return
- else
- # actual call to activate: source the output
- set -l sp_env_cmd "command spack $sp_flags $sp_subcommand --fish $__sp_remaining_args"
- capture_all $sp_env_cmd __sp_stat __sp_stdout __sp_stderr
- if test $__sp_stat -ne 0
- if test -n "$__sp_stderr"
- echo -s \n$__sp_stderr 1>&2 # current fish bug: handle stderr manually
- end
- return $__sp_stat
+ if check_env_activate_flags $_a
+ # no args or args contain -h/--help, --sh, or --csh: just execute
+ command spack $sp_flags $sp_subcommand $__sp_remaining_args
+ return
+ else
+ # actual call to activate: source the output
+ set -l sp_env_cmd "command spack $sp_flags $sp_subcommand --fish $__sp_remaining_args"
+ capture_all $sp_env_cmd __sp_stat __sp_stdout __sp_stderr
+ if test $__sp_stat -ne 0
+ if test -n "$__sp_stderr"
+ echo -s \n$__sp_stderr 1>&2 # current fish bug: handle stderr manually
end
- eval $__sp_stdout
+ return $__sp_stat
end
+ eval $__sp_stdout
+ end
- # CASE: Catch-all
+ # CASE: Catch-all
- case "*"
- command spack $argv
- return
- end
+ case "*"
+ command spack $argv
+ return
end
+end
- #
- # RUN SPACK_RUNNER HERE
- #
+#
+# RUN SPACK_RUNNER HERE
+#
- #
- # Allocate temporary global variables used for return extra arguments from
- # functions. NOTE: remember to call delete_sp_shared whenever returning from
- # this function.
- #
+#
+# Allocate temporary global variables used for return extra arguments from
+# functions. NOTE: remember to call delete_sp_shared whenever returning from
+# this function.
+#
- allocate_sp_shared
+allocate_sp_shared
- #
- # Run spack command using the spack_runner.
- #
+#
+# Run spack command using the spack_runner.
+#
- spack_runner $argv
- # Capture state of spack_runner (returned below)
- set -l stat $status
+spack_runner $argv
+# Capture state of spack_runner (returned below)
+set -l stat $status
- #
- # Delete temprary global variabels allocated in `allocated_sp_shared`.
- #
+#
+# Delete temprary global variabels allocated in `allocated_sp_shared`.
+#
- delete_sp_shared
+delete_sp_shared
- return $stat
+return $stat
end
@@ -681,7 +681,7 @@ end
#
# Figure out where this file is. Below code only needs to work in fish
#
-set -l sp_source_file (status -f) # name of current file
+set -l sp_source_file (status -f) # name of current file
@@ -711,8 +711,8 @@ set -xg SPACK_ROOT $sp_prefix
#
# No need to determine which shell is being used (obviously it's fish)
#
-set -xg SPACK_SHELL fish
-set -xg _sp_shell fish
+set -xg SPACK_SHELL "fish"
+set -xg _sp_shell "fish"
@@ -721,9 +721,9 @@ if test -z "$SPACK_SKIP_MODULES"
#
# Check whether we need environment-variables (module) <= `use` is not available
#
- set -l need_module no
+ set -l need_module "no"
if not functions -q use; and not functions -q module
- set need_module yes
+ set need_module "yes"
end
@@ -742,7 +742,7 @@ if test -z "$SPACK_SKIP_MODULES"
end
- if test "$need_module" = yes
+ if test "$need_module" = "yes"
set -l sp_shell_vars (command spack --print-shell-vars sh,modules)
for sp_var_expr in $sp_shell_vars
@@ -750,7 +750,7 @@ if test -z "$SPACK_SKIP_MODULES"
end
# _sp_module_prefix is set by spack --print-sh-vars
- if test "$_sp_module_prefix" != not_installed
+ if test "$_sp_module_prefix" != "not_installed"
set -xg MODULE_PREFIX $_sp_module_prefix
spack_pathadd PATH "$MODULE_PREFIX/bin"
end
@@ -765,7 +765,7 @@ if test -z "$SPACK_SKIP_MODULES"
end
- if test "$need_module" = yes
+ if test "$need_module" = "yes"
function module -d "wrapper for the `module` command to point at Spack's modules instance" --inherit-variable MODULE_PREFIX
eval $MODULE_PREFIX/bin/modulecmd $SPACK_SHELL $argv
end
diff --git a/share/spack/spack-completion.fish b/share/spack/spack-completion.fish
index ec41b38931..00cbe80ca2 100755
--- a/share/spack/spack-completion.fish
+++ b/share/spack/spack-completion.fish
@@ -2643,9 +2643,9 @@ complete -c spack -n '__fish_spack_using_command style' -s f -l fix -d 'format a
complete -c spack -n '__fish_spack_using_command style' -l root -r -f -a root
complete -c spack -n '__fish_spack_using_command style' -l root -r -d 'style check a different spack instance'
complete -c spack -n '__fish_spack_using_command style' -s t -l tool -r -f -a tool
-complete -c spack -n '__fish_spack_using_command style' -s t -l tool -r -d 'specify which tools to run (default: isort,black,flake8,mypy,fish_indent)'
+complete -c spack -n '__fish_spack_using_command style' -s t -l tool -r -d 'specify which tools to run (default: isort,black,flake8,mypy)'
complete -c spack -n '__fish_spack_using_command style' -s s -l skip -r -f -a skip
-complete -c spack -n '__fish_spack_using_command style' -s s -l skip -r -d 'specify tools to skip (choose from isort,black,flake8,mypy,fish_indent)'
+complete -c spack -n '__fish_spack_using_command style' -s s -l skip -r -d 'specify tools to skip (choose from isort,black,flake8,mypy)'
# spack tags
set -g __fish_spack_optspecs_spack_tags h/help i/installed a/all