kalasag.org

commit 8b2d801fab0c5f4272e5972e58af812f8b13e9a9
tree 2ffeaa6f9e1e56f003045146b3c250fe8e0fb277
parent 74d9ea4b054eb93fe6457bd4f96be73fb2ddc266
author Engels Antonio <engels@kalasag.org> 1639241075 +0800
committer Engels Antonio <engels@kalasag.org> 1639241075 +0800

    Improve make install

diff --git a/Makefile b/Makefile
index 8109157..c9733b5 100644
--- a/Makefile
+++ b/Makefile
@@ -68,26 +68,17 @@ uninstall:
                /bin/rmdir $(INSTALLDIR)$(CHILDDIR)
 
 install:      
-               @echo "Creating directory $(INSTALLDIR)"
-               @if [ ! -d $(INSTALLDIR) ]; then /bin/mkdir $(INSTALLDIR); fi
-               @echo "Setting directory permissions"
-               @echo "Creating kalasag directory $(INSTALLDIR)$(CHILDDIR)"
-               @if [ ! -d $(INSTALLDIR)$(CHILDDIR) ]; then /bin/mkdir $(INSTALLDIR)$(CHILDDIR); fi
-               @echo "Setting directory permissions"
-               chmod 700 $(INSTALLDIR)$(CHILDDIR)
-               @echo "Copying files"
-               cp ./kalasag.conf $(INSTALLDIR)$(CHILDDIR)
-               cp ./kalasag.ignore $(INSTALLDIR)$(CHILDDIR)
-               cp ./kalasag $(INSTALLDIR)$(CHILDDIR)
-               if [ -d /usr/lib/systemd/system ]; then cp ./kalasag.service /usr/lib/systemd/system/; /bin/systemctl enable kalasag.service; fi
-               @echo "Setting permissions"
-               chmod 600 $(INSTALLDIR)$(CHILDDIR)/kalasag.ignore
-               chmod 600 $(INSTALLDIR)$(CHILDDIR)/kalasag.conf
-               chmod 700 $(INSTALLDIR)$(CHILDDIR)/kalasag
+               @if [ ! -d $(INSTALLDIR)$(CHILDDIR) ]; then mkdir -p $(INSTALLDIR)$(CHILDDIR); fi
+               @chmod 700 $(INSTALLDIR)$(CHILDDIR)
+               @cp ./kalasag.conf $(INSTALLDIR)$(CHILDDIR)
+               @cp ./kalasag.ignore $(INSTALLDIR)$(CHILDDIR)
+               @cp ./kalasag $(INSTALLDIR)$(CHILDDIR)
+               @if [ -d /usr/lib/systemd/system ]; then cp ./kalasag.service /usr/lib/systemd/system/; systemctl enable kalasag.service; fi
+               @chmod 600 $(INSTALLDIR)$(CHILDDIR)/kalasag.ignore
+               @chmod 600 $(INSTALLDIR)$(CHILDDIR)/kalasag.conf
+               @chmod 700 $(INSTALLDIR)$(CHILDDIR)/kalasag
                @echo ""
-               @echo ""
-               @echo "Edit $(INSTALLDIR)$(CHILDDIR)/kalasag.conf and change"
-               @echo "your settings if you haven't already. (route, etc)"
+               @echo 'Issue "systemctl restart kalasag.service" after editing $(INSTALLDIR)$(CHILDDIR)/kalasag.conf.'
                @echo ""
 
 linux: