Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 21:33:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some more precautionary uses of set --local

Browse source
This commit is contained in:
Johannes Altmanninger 2020-05-15 21:34:48 +02:00
parent 62f1ed0b5e
commit ec2371fb79
11 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build_tools/list_committers_since.fish
View file

@ -12,8 +12,8 @@ if not contains -- $TAG (git tag)
exit 1 exit 1
end end
set committers_to_tag (mktemp) set -l committers_to_tag (mktemp)
set committers_from_tag (mktemp) set -l committers_from_tag (mktemp)
# You might think it would be better to case-insensitively sort/compare the names # You might think it would be better to case-insensitively sort/compare the names
# to produce a more natural-looking list. # to produce a more natural-looking list.

2
share/functions/__fish_append.fish
View file

@ -1,6 +1,6 @@
function __fish_append -d "Internal completion function for appending string to the commandline" --argument sep function __fish_append -d "Internal completion function for appending string to the commandline" --argument sep
set -e argv[1] set -e argv[1]
set str (commandline -tc | string replace -rf "(.*$sep)[^$sep]*" '$1' | string replace -r -- '--.*=' '') set -l str (commandline -tc | string replace -rf "(.*$sep)[^$sep]*" '$1' | string replace -r -- '--.*=' '')
printf "%s\n" "$str"$argv printf "%s\n" "$str"$argv
end end

4
share/functions/__fish_complete_mount_opts.fish
View file

@ -1,7 +1,7 @@
function __fish_print_user_ids function __fish_print_user_ids
if command -sq getent if command -sq getent
for line in (getent passwd) for line in (getent passwd)
set v (string split : -- $line) set -l v (string split : -- $line)
printf "%s\t%s\n" $v[3] $v[1] printf "%s\t%s\n" $v[3] $v[1]
end end
end end
@ -10,7 +10,7 @@ end
function __fish_print_group_ids function __fish_print_group_ids
if command -sq getent if command -sq getent
for line in (getent group) for line in (getent group)
set v (string split : -- $line) set -l v (string split : -- $line)
printf "%s\t%s\n" $v[3] $v[1] printf "%s\t%s\n" $v[3] $v[1]
end end
end end

2
share/functions/__fish_complete_subcommand.fish
View file

@ -25,7 +25,7 @@ function __fish_complete_subcommand -d "Complete subcommand" --no-scope-shadowin
set -l options_with_param $argv set -l options_with_param $argv
if not string length -q -- $subcommand if not string length -q -- $subcommand
set cmd (commandline -cop) (commandline -ct) set -l cmd (commandline -cop) (commandline -ct)
while set -q cmd[1] while set -q cmd[1]
set -l token $cmd[1] set -l token $cmd[1]
set -e cmd[1] set -e cmd[1]

4
share/functions/__fish_list_current_token.fish
View file

@ -2,12 +2,12 @@
# of the directory under the cursor. # of the directory under the cursor.
function __fish_list_current_token -d "List contents of token under the cursor if it is a directory, otherwise list the contents of the current directory" function __fish_list_current_token -d "List contents of token under the cursor if it is a directory, otherwise list the contents of the current directory"
set val (eval echo (commandline -t)) set -l val (eval echo (commandline -t))
printf "\n" printf "\n"
if test -d $val if test -d $val
ls $val ls $val
else else
set dir (dirname -- $val) set -l dir (dirname -- $val)
if test $dir != . -a -d $dir if test $dir != . -a -d $dir
ls $dir ls $dir
else else

2
share/functions/__fish_npm_helper.fish
View file

@ -38,7 +38,7 @@ function __yarn_filtered_list_packages
end end
function __yarn_find_package_json function __yarn_find_package_json
set parents (__fish_parent_directories (pwd -P)) set -l parents (__fish_parent_directories (pwd -P))
for p in $parents for p in $parents
if test -f "$p/package.json" if test -f "$p/package.json"

16
share/functions/__fish_print_packages.fish
View file

@ -113,8 +113,8 @@ function __fish_print_packages
set -l cache_file $xdg_cache_home/.yum-cache.$USER set -l cache_file $xdg_cache_home/.yum-cache.$USER
if test -f $cache_file if test -f $cache_file
cat $cache_file cat $cache_file
set age (math (date +%s) - (stat -c '%Y' $cache_file)) set -l age (math (date +%s) - (stat -c '%Y' $cache_file))
set max_age 21600 set -l max_age 21600
if test $age -lt $max_age if test $age -lt $max_age
return return
end end
@ -135,8 +135,8 @@ function __fish_print_packages
set -l cache_file $xdg_cache_home/.rpm-cache.$USER set -l cache_file $xdg_cache_home/.rpm-cache.$USER
if test -f $cache_file if test -f $cache_file
cat $cache_file cat $cache_file
set age (math (date +%s) - (stat -c '%Y' $cache_file)) set -l age (math (date +%s) - (stat -c '%Y' $cache_file))
set max_age 250 set -l max_age 250
if test $age -lt $max_age if test $age -lt $max_age
return return
end end
@ -158,8 +158,8 @@ function __fish_print_packages
set -l cache_file $xdg_cache_home/.eopkg-installed-cache.$USER set -l cache_file $xdg_cache_home/.eopkg-installed-cache.$USER
if test -f $cache_file if test -f $cache_file
cat $cache_file cat $cache_file
set age (math (date +%s) - (stat -c '%Y' $cache_file)) set -l age (math (date +%s) - (stat -c '%Y' $cache_file))
set max_age 500 set -l max_age 500
if test $age -lt $max_age if test $age -lt $max_age
return return
end end
@ -172,8 +172,8 @@ function __fish_print_packages
set -l cache_file $xdg_cache_home/.eopkg-available-cache.$USER set -l cache_file $xdg_cache_home/.eopkg-available-cache.$USER
if test -f $cache_file if test -f $cache_file
cat $cache_file cat $cache_file
set age (math (date +%s) - (stat -c '%Y' $cache_file)) set -l age (math (date +%s) - (stat -c '%Y' $cache_file))
set max_age 500 set -l max_age 500
if test $age -lt $max_age if test $age -lt $max_age
return return
end end

2
share/functions/__fish_seen_argument.fish
View file

@ -1,7 +1,7 @@
function __fish_seen_argument function __fish_seen_argument
argparse 's/short=+' 'o/old=+' 'l/long=+' -- $argv argparse 's/short=+' 'o/old=+' 'l/long=+' -- $argv
set cmd (commandline -co) set -l cmd (commandline -co)
set -e cmd[1] set -e cmd[1]
for t in $cmd for t in $cmd
for s in $_flag_s for s in $_flag_s

2
share/functions/realpath.fish
View file

@ -35,7 +35,7 @@ function realpath -d "return an absolute path without symlinks"
# We don't implement any of the other flags so if any are set it's an error. # We don't implement any of the other flags so if any are set it's an error.
if string match -q '_flag_*' -- (set -l) if string match -q '_flag_*' -- (set -l)
set flags (set -l | string replace --filter _flag_ '') set -l flags (set -l | string replace --filter _flag_ '')
printf (_ "%s: These flags are not allowed by fish realpath: '%s'") realpath "$flags" >&2 printf (_ "%s: These flags are not allowed by fish realpath: '%s'") realpath "$flags" >&2
echo >&2 echo >&2
__fish_print_help realpath __fish_print_help realpath

2
share/functions/trap.fish
View file

@ -65,7 +65,7 @@ function trap -d 'Perform an action when the shell receives a signal'
for i in $argv for i in $argv
set -l sig (__trap_translate_signal $i) set -l sig (__trap_translate_signal $i)
set sw (__trap_switch $sig) set -l sw (__trap_switch $sig)
if test -n "$sig" if test -n "$sig"
echo "function __trap_handler_$sig $sw; $cmd; end" | source echo "function __trap_handler_$sig $sw; $cmd; end" | source

2
share/functions/up-or-search.fish
View file

@ -14,7 +14,7 @@ function up-or-search -d "Depending on cursor position and current mode, either
# We are not already in search mode. # We are not already in search mode.
# If we are on the top line, start search mode, # If we are on the top line, start search mode,
# otherwise move up # otherwise move up
set lineno (commandline -L) set -l lineno (commandline -L)
switch $lineno switch $lineno
case 1 case 1