mirror of
https://github.com/jorgebucaran/fisher
synced 2024-10-09 09:36:53 +02:00
Use -R instead of -r with cp.
This commit is contained in:
parent
f1f35048b4
commit
eb33459e4c
1 changed files with 7 additions and 7 deletions
14
fisher.fish
14
fisher.fish
|
@ -443,7 +443,7 @@ function __fisher_plugin_fetch_items
|
||||||
if test -L "$src"
|
if test -L "$src"
|
||||||
command ln -sf "$src" "$fisher_config"
|
command ln -sf "$src" "$fisher_config"
|
||||||
else
|
else
|
||||||
command cp -rf "$src" "$fisher_config"
|
command cp -Rf "$src" "$fisher_config"
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
set jobs $jobs (__fisher_plugin_url_clone_async "$i" "$names[1]")
|
set jobs $jobs (__fisher_plugin_url_clone_async "$i" "$names[1]")
|
||||||
|
@ -453,7 +453,7 @@ function __fisher_plugin_fetch_items
|
||||||
set -l real_namespace (__fisher_plugin_get_url_info --dirname "$src" )
|
set -l real_namespace (__fisher_plugin_get_url_info --dirname "$src" )
|
||||||
|
|
||||||
if test "$real_namespace" = "$names[2]"
|
if test "$real_namespace" = "$names[2]"
|
||||||
command cp -rf "$src" "$fisher_config"
|
command cp -Rf "$src" "$fisher_config"
|
||||||
else
|
else
|
||||||
set jobs $jobs (__fisher_plugin_url_clone_async "$i" "$names[1]")
|
set jobs $jobs (__fisher_plugin_url_clone_async "$i" "$names[1]")
|
||||||
end
|
end
|
||||||
|
@ -516,10 +516,10 @@ function __fisher_plugin_url_clone_async -a url name
|
||||||
set -lx GIT_ASKPASS /bin/echo
|
set -lx GIT_ASKPASS /bin/echo
|
||||||
|
|
||||||
if command git clone -q --depth 1 '$url' '$fisher_cache/$name' ^ /dev/null
|
if command git clone -q --depth 1 '$url' '$fisher_cache/$name' ^ /dev/null
|
||||||
printf '$okay""OKAY""$nc Fetching $okay%s$nc %s\n' '$name' '$hm_url' > $__fisher_stderr
|
printf '$okay""OKAY""$nc Fetch $okay%s$nc %s\n' '$name' '$hm_url' > $__fisher_stderr
|
||||||
command cp -rf '$fisher_cache/$name' '$fisher_config'
|
command cp -Rf '$fisher_cache/$name' '$fisher_config'
|
||||||
else
|
else
|
||||||
printf '$error""ARGH""$nc Fetching $error%s$nc %s\n' '$name' '$hm_url' > $__fisher_stderr
|
printf '$error""ARGH""$nc Fetch $error%s$nc %s\n' '$name' '$hm_url' > $__fisher_stderr
|
||||||
end
|
end
|
||||||
" > /dev/stderr &
|
" > /dev/stderr &
|
||||||
|
|
||||||
|
@ -625,7 +625,7 @@ function __fisher_update_path_async -a name path
|
||||||
pushd $path
|
pushd $path
|
||||||
|
|
||||||
if not command git fetch -q origin master ^ /dev/null
|
if not command git fetch -q origin master ^ /dev/null
|
||||||
printf '$error""ARGH""$nc Fetching $error%s$nc\n' '$name' > $__fisher_stderr
|
printf '$error""ARGH""$nc Fetch $error%s$nc\n' '$name' > $__fisher_stderr
|
||||||
exit
|
exit
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -633,7 +633,7 @@ function __fisher_update_path_async -a name path
|
||||||
|
|
||||||
command git reset -q --hard FETCH_HEAD ^ /dev/null
|
command git reset -q --hard FETCH_HEAD ^ /dev/null
|
||||||
command git clean -qdfx
|
command git clean -qdfx
|
||||||
command cp -rf '$path/.' '$fisher_cache/$name'
|
command cp -Rf '$path/.' '$fisher_cache/$name'
|
||||||
|
|
||||||
if test -z \"\$commits\" -o \"\$commits\" -eq 0
|
if test -z \"\$commits\" -o \"\$commits\" -eq 0
|
||||||
printf '$okay""OKAY""$nc Latest $okay%s$nc\n' '$name' > $__fisher_stderr
|
printf '$okay""OKAY""$nc Latest $okay%s$nc\n' '$name' > $__fisher_stderr
|
||||||
|
|
Loading…
Reference in a new issue