Update Makefile

Makefile

@@ -5,13 +5,9 @@ LIBEXECDIR = $(PREFIX)/libexec/sourcezap
 SHAREDIR = $(PREFIX)/share/sourcezap
 
 install:
-	install -d $(BINDIR) $(LIBEXECDIR) $(LIBEXECDIR)/commands $(LIBEXECDIR)/utils $(SHAREDIR) $(MANDIR)
-	install -m 0755 bin/sourcezap $(BINDIR)
-	install -m 0755 bin/setup-sourcezap $(BINDIR)
-	install -m 0755 libexec/sourcezap/commands/* $(LIBEXECDIR)/commands
-	install -m 0755 libexec/sourcezap/utils/* $(LIBEXECDIR)/utils
-	install -m 0644 share/sourcezap/* $(SHAREDIR)
-	install -m 0644 man/man8/sourcezap.8 $(MANDIR)
+	@find bin/ libexec/ share/ -type d -exec install -v -d $(PREFIX)/"{}" \;
+	@find bin/ libexec/ -type f -exec install -v -m 0755 "{}" $(PREFIX)/"{}" \;
+	@find share/ man/ -type f -exec install -v -m 0644 "{}" $(PREFIX)/"{}" \;
 
 deinstall:
 	rm $(BINDIR)/sourcezap
@@ -21,6 +17,4 @@ deinstall:
 	rm -rf $(SHAREDIR)
 
 shellcheck:
-	shellcheck bin/*
-	shellcheck libexec/sourcezap/utils/*
-	shellcheck libexec/sourcezap/commands/*
+	find bin/ libexec/ -type f -exec shellcheck "{}" \;

libexec/sourcezap/commands/sourcezap-checkout

@@ -11,7 +11,7 @@ branch=$2
 
 ##
 # functions
-. "${libexec}"/functions.sh
+. "${libexec}"/functions/print.sh
 
 ##
 # main

libexec/sourcezap/commands/sourcezap-clone

@@ -12,7 +12,7 @@ branch=$3
 
 ##
 # functions
-. "${libexec}"/functions.sh
+. "${libexec}"/functions/print.sh
 
 ##
 # main

libexec/sourcezap/commands/sourcezap-install

@@ -13,7 +13,7 @@ revfile=$3
 
 ##
 # functions
-. "${libexec}"/functions.sh
+. "${libexec}"/functions/print.sh
 
 perform_update()
 {

libexec/sourcezap/commands/sourcezap-pull

@@ -10,7 +10,7 @@ gitdir=$1
 
 ##
 # functions
-. "${libexec}"/functions.sh
+. "${libexec}"/functions/print.sh
 
 ##
 # main

libexec/sourcezap/commands/sourcezap-rm

@@ -10,7 +10,7 @@ installdir=$2
 
 ##
 # functions
-. "${libexec}"/functions.sh
+. "${libexec}"/functions/print.sh
 
 erase()
 {

libexec/sourcezap/utils/git/get-changed-files

@@ -9,10 +9,6 @@ git="${libexec}"/utils/git/run
 gitdir=$1
 commit=$2
 
-##
-# functions
-. "${libexec}"/functions.sh
-
 ##
 # main
 cd "${gitdir}"

libexec/sourcezap/utils/git/get-removed-files

@@ -9,10 +9,6 @@ git="${libexec}"/utils/git/run
 gitdir=$1
 commit=$2
 
-##
-# functions
-. "${libexec}"/functions.sh
-
 ##
 # main
 cd "${gitdir}"