From: AJ ONeal <coolaj86@gmail.com>
Date: Tue, 16 Jun 2020 12:29:40 +0000 (-0600)
Subject: only ask to delete when not a symlink
X-Git-Url: https://git.josue.xyz/?a=commitdiff_plain;h=f2225e074999d58fc41b941e988e4a165af2847b;p=webi-installers%2F.git

only ask to delete when not a symlink
---

diff --git a/_webi/template.sh b/_webi/template.sh
index 34484d7..b91cd16 100644
--- a/_webi/template.sh
+++ b/_webi/template.sh
@@ -71,19 +71,19 @@ webi_link() {
     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"
+        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
-        if [ -d "$pkg_dst" ]; then
-            rm -rf -i "$pkg_dst"
-        else
+        if [ -L "$pkg_dst" ]; then
             rm -f "$pkg_dst"
+        else
+            rm -rf -i "$pkg_dst"
         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)"
-        if [ -d "$pkg_src" ]; then
-            rm -rf -i "$pkg_src"
-        else
+        if [ -L "$pkg_src" ]; then
             rm -f "$pkg_src"
+        else
+            rm -rf -i "$pkg_src"
         fi
         mv ./"$pkg_cmd_name"* "$pkg_src"
     fi