From cd948af2dd09b7feb64f17d8241bad8f4600f421 Mon Sep 17 00:00:00 2001 From: Anoop S <40671157+anoop142@users.noreply.github.com> Date: Sun, 5 Nov 2023 23:20:58 +0530 Subject: [PATCH] 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 --- Makefile | 6 ++++++ install.sh.in | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 0dec064..e990653 100644 --- 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 index 49b40c7..02f2041 100755 --- 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