From 795a7d7fca020a76383ac44547c8069401fd4286 Mon Sep 17 00:00:00 2001 From: gokul swaminathan <33443763+JavaCafe01@users.noreply.github.com> Date: Thu, 25 Mar 2021 19:07:58 -0700 Subject: [PATCH] fix: #7 and add `-i` flag to sed cmd (#11) * Fixes #7 and adds `-i` to sed cmd * Removed build dep * Update README.md * improve sed cmd --- Makefile | 15 ++++++++------- README.md | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 046597b..a1c0f5f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ PREFIX ?= /usr +DESTDIR ?= BINDIR ?= $(PREFIX)/bin LIBDIR ?= $(PREFIX)/share/hilbish @@ -6,17 +7,17 @@ build: @go build install: - @install -v -d "$(BINDIR)/" && install -m 0755 -v hilbish "$(BINDIR)/hilbish" - @mkdir -p "$(LIBDIR)" - @cp libs preload.lua .hilbishrc.lua "$(LIBDIR)" -r - @echo /usr/bin/hilbish >> /etc/shells + @install -v -d "$(DESTDIR)$(BINDIR)/" && install -m 0755 -v hilbish "$(DESTDIR)$(BINDIR)/hilbish" + @mkdir -p "$(DESTDIR)$(LIBDIR)" + @cp libs preload.lua .hilbishrc.lua "$(DESTDIR)$(LIBDIR)" -r + @echo "$(DESTDIR)$(BINDIR)/hilbish" >> /etc/shells @echo "Hilbish Installed" uninstall: @rm -vrf \ - "$(BINDIR)/hilbish" \ - "$(LIBDIR)" - @sed '/\/usr\/bin\/hilbish/d' /etc/shells + "$(DESTDIR)$(BINDIR)/hilbish" \ + "$(DESTDIR)$(LIBDIR)" + @sed -i '/hilbish/d' /etc/shells @echo "Hilbish Uninstalled" clean: diff --git a/README.md b/README.md index 00853c3..41836a0 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ cd Hilbish make build sudo make install # Or -sudo make +sudo make all ``` Alternativly, if you use Arch Linux, you can install Hilbish with an **(unofficial)** AUR package