Uninstall (#40)

* uninstall: force delete uninstall script fails midway if dirs/files didn't exist don't exit if rmdir fails. * Makefile: add uninstall * Makefile: typo
varnamproject · Nov 5, 2023 · cd948af · cd948af
1 parent f17a33a
commit cd948af
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -52,6 +52,12 @@ install-script:
 install:
 	./install.sh install
 
+.PHONY: uninstall
+uninstall: install-script
+	./install.sh uninstall
+
+
+
 .PHONY: cli
 cli:
 	go build -o ${CLI_BIN} -ldflags "-s -w" ./cli

diff --git a/install.sh.in b/install.sh.in
@@ -28,11 +28,11 @@ if [ "$ARG1" == "install" ]; then
 
   notify-send "$msg" &> /dev/null || true
 elif [ "$ARG1" == "uninstall" ]; then
-  "${SUDO}" rm "@INSTALL_PREFIX@/bin/varnamcli" "@INSTALL_PREFIX@/lib/@LIB_NAME@.@VERSION@" "@INSTALL_PREFIX@/lib/@LIB_NAME@" "@INSTALL_PREFIX@/lib/pkgconfig/govarnam.pc"
-  "${SUDO}" rm "@INSTALL_PREFIX@/include/libgovarnam/"*
-  "${SUDO}" rmdir "@INSTALL_PREFIX@/include/libgovarnam"
-  "${SUDO}" rm "@INSTALL_PREFIX@/share/varnam/schemes/"*
-  "${SUDO}" rmdir "@INSTALL_PREFIX@/share/varnam/schemes/"
+  "${SUDO}" rm -f "@INSTALL_PREFIX@/bin/varnamcli" "@INSTALL_PREFIX@/lib/@LIB_NAME@.@VERSION@" "@INSTALL_PREFIX@/lib/@LIB_NAME@" "@INSTALL_PREFIX@/lib/pkgconfig/govarnam.pc"
+  "${SUDO}" rm -f "@INSTALL_PREFIX@/include/libgovarnam/"*
+  "${SUDO}" rmdir "@INSTALL_PREFIX@/include/libgovarnam" || true
+  "${SUDO}" rm -f "@INSTALL_PREFIX@/share/varnam/schemes/"* 
+  "${SUDO}" rmdir "@INSTALL_PREFIX@/share/varnam/schemes/" || true
 
   msg="Uninstallation finished"
   echo $msg