kalasag.org

kalasag.org

Git

This commit has been accessed 42 times via Git panel.

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:        
 
filedropkalasag.git-1c9f013.tar.bz2 new
20.95 KB
37 downloads
filedropkalasag.git-1c9f013.zip
25.81 KB
3 downloads
filedropkalasag.git-3ca3612.tar.bz2
20.80 KB
5 downloads
filedropkalasag.git-3ca3612.zip
25.66 KB
3 downloads
filedropkalasag.git-2ffeaa6.tar.bz2
20.80 KB
6 downloads
filedropkalasag.git-2ffeaa6.zip
25.65 KB
3 downloads
filedropkalasag.git-2834a11.tar.bz2
20.84 KB
244 downloads
filedropkalasag.git-2834a11.zip
25.72 KB
113 downloads
filedropkalasag.git-afd7b31.tar.bz2
20.84 KB
180 downloads
filedropkalasag.git-afd7b31.zip
25.71 KB
67 downloads
filedropkalasag.git-97c89e1.tar.bz2
20.82 KB
262 downloads
filedropkalasag.git-97c89e1.zip
25.68 KB
166 downloads
filedropkalasag.git-1141d13.tar.bz2
20.65 KB
803 downloads
filedropkalasag.git-1141d13.zip
25.37 KB
159 downloads
filedropkalasag.git-ee3c17b.tar.bz2
20.65 KB
775 downloads
filedropkalasag.git-ee3c17b.zip
25.34 KB
154 downloads
filedropkalasag.git-4032c54.tar.bz2
20.63 KB
264 downloads
filedropkalasag.git-4032c54.zip
25.13 KB
170 downloads
filedropkalasag.git-e51a2a6.tar.bz2
20.65 KB
263 downloads
filedropkalasag.git-e51a2a6.zip
25.13 KB
144 downloads
filedropkalasag.git-599c93a.tar.bz2
20.63 KB
255 downloads
filedropkalasag.git-599c93a.zip
25.11 KB
1,464 downloads
filedropkalasag.git-acdc640.tar.bz2
20.63 KB
242 downloads
filedropkalasag.git-acdc640.zip
25.10 KB
154 downloads