From: AJ ONeal <aj@therootcompany.com>
Date: Tue, 16 Jun 2020 16:02:25 +0000 (+0000)
Subject: adjust rm command for single-file installers
X-Git-Url: https://git.josue.xyz/?a=commitdiff_plain;h=5dfce0406c11350465b6004a336d63614f2103a1;p=webi-installers%2F.git

adjust rm command for single-file installers
---

diff --git a/_webi/template.sh b/_webi/template.sh
index b91cd16..1b302a2 100644
--- a/_webi/template.sh
+++ b/_webi/template.sh
@@ -73,7 +73,8 @@ webi_link() {
     if [ -n "$WEBI_SINGLE" ] || [ "single" == "${1:-}" ]; then
         if [ -L "$pkg_dst_cmd" ]; then
             rm -f "$pkg_dst_cmd"
-        else
+        elif [ -e "$pkg_dst_cmd" ]; then
+            echo "remove $pkg_dst_cmd?"
             rm -rf -i "$pkg_dst_cmd"
         fi
         ln -s "$pkg_src_cmd" "$pkg_dst_cmd"
@@ -82,7 +83,8 @@ webi_link() {
         # 'pkg_src' will be the installed version, such as to $HOME/.local/opt/node-v12.8.0
         if [ -L "$pkg_dst" ]; then
             rm -f "$pkg_dst"
-        else
+        elif [ -e "$pkg_dst" ]; then
+            echo "remove $pkg_dst?"
             rm -rf -i "$pkg_dst"
         fi
         ln -s "$pkg_src" "$pkg_dst"
@@ -224,7 +226,8 @@ webi_install() {
         mkdir -p "$(dirname $pkg_src)"
         if [ -L "$pkg_src" ]; then
             rm -f "$pkg_src"
-        else
+        elif [ -e "$pkg_src" ]; then
+            echo "remove $pkg_src?"
             rm -rf -i "$pkg_src"
         fi
         mv ./"$pkg_cmd_name"* "$pkg_src"