sebastiano.tronto.net

commit 152a9ea1ee5f12cae69448a4971adaa1b2fbcc17
parent a639c20e7cdba4abcfd8041939d70124bfb8fa23
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date:   Mon, 26 Sep 2022 17:32:39 +0200

Improved rsync name resolution

Diffstat:
M
Makefile
 | 
7
+++----

1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,5 +1,6 @@
 DEST="tronto.net:/var/www/htdocs/sebastiano.tronto.net"
 DESTGEMINI="tronto.net:/var/gemini"
+RSYNC=$$( (command -V rsync 2>&1 > /dev/null && echo rsync) || echo openrsync)
 
 all: clean
 	./build.sh
@@ -11,11 +12,9 @@ clean:
 deploy: syncgemini synchttp
 
 syncgemini:
-	rsync -rv --delete --rsync-path=openrsync gemini/ ${DESTGEMINI} || \
-	openrsync -rv --delete --rsync-path=openrsync gemini/ ${DESTGEMINI}
+	${RSYNC} -rv --delete --rsync-path=openrsync gemini/ ${DESTGEMINI}
 
 synchttp:
-	rsync -rv --delete --rsync-path=openrsync http/ ${DEST} || \
-	openrsync -rv --delete --rsync-path=openrsync http/ ${DEST}
+	${RSYNC} -rv --delete --rsync-path=openrsync http/ ${DEST}
 
 .PHONY: all clean deploy syncgemini synchttp