projects
/
webi-installers
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6b6a9d7
)
only ask to delete when not a symlink
author
AJ ONeal
<coolaj86@gmail.com>
Tue, 16 Jun 2020 12:29:40 +0000
(06:29 -0600)
committer
AJ ONeal
<coolaj86@gmail.com>
Tue, 16 Jun 2020 12:29:40 +0000
(06:29 -0600)
_webi/template.sh
patch
|
blob
|
history
diff --git
a/_webi/template.sh
b/_webi/template.sh
index 34484d7b2478354012d2c8155e6b3d7dac0ea2c1..b91cd1632ced43ba0cfecfc27df28d7e08877630 100644
(file)
--- a/
_webi/template.sh
+++ b/
_webi/template.sh
@@
-71,19
+71,19
@@
webi_link() {
fi
if [ -n "$WEBI_SINGLE" ] || [ "single" == "${1:-}" ]; then
fi
if [ -n "$WEBI_SINGLE" ] || [ "single" == "${1:-}" ]; then
- if [ -d "$pkg_dst_cmd" ]; then
- rm -rf -i "$pkg_dst_cmd"
- else
+ if [ -L "$pkg_dst_cmd" ]; then
rm -f "$pkg_dst_cmd"
rm -f "$pkg_dst_cmd"
+ else
+ rm -rf -i "$pkg_dst_cmd"
fi
ln -s "$pkg_src_cmd" "$pkg_dst_cmd"
else
# 'pkg_dst' will default to $HOME/.local/opt/node
# 'pkg_src' will be the installed version, such as to $HOME/.local/opt/node-v12.8.0
fi
ln -s "$pkg_src_cmd" "$pkg_dst_cmd"
else
# 'pkg_dst' will default to $HOME/.local/opt/node
# 'pkg_src' will be the installed version, such as to $HOME/.local/opt/node-v12.8.0
- if [ -d "$pkg_dst" ]; then
- rm -rf -i "$pkg_dst"
- else
+ if [ -L "$pkg_dst" ]; then
rm -f "$pkg_dst"
rm -f "$pkg_dst"
+ else
+ rm -rf -i "$pkg_dst"
fi
ln -s "$pkg_src" "$pkg_dst"
fi
fi
ln -s "$pkg_src" "$pkg_dst"
fi
@@
-222,10
+222,10
@@
webi_install() {
chmod a+x "$pkg_src_cmd"
else
mkdir -p "$(dirname $pkg_src)"
chmod a+x "$pkg_src_cmd"
else
mkdir -p "$(dirname $pkg_src)"
- if [ -d "$pkg_src" ]; then
- rm -rf -i "$pkg_src"
- else
+ if [ -L "$pkg_src" ]; then
rm -f "$pkg_src"
rm -f "$pkg_src"
+ else
+ rm -rf -i "$pkg_src"
fi
mv ./"$pkg_cmd_name"* "$pkg_src"
fi
fi
mv ./"$pkg_cmd_name"* "$pkg_src"
fi