summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2017-09-08 13:05:08 +0200
committeremkael <emkael@tlen.pl>2017-09-08 13:05:08 +0200
commit200890d01feb2fa26159cf18237f9a4f23286a59 (patch)
tree31122b62d63051726d932af30ac97b1fa084b84f
parent2cddc37cf15be7290140f748914312c94a6a3266 (diff)
Deploy script source directory defined as parameter
-rw-r--r--Makefile2
-rwxr-xr-xbin/deploy.sh5
-rw-r--r--docs/scripts.md2
3 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index a5ec358..93a6e49 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ $(tmpfiles):
deploy:
find http -type f -name .menu.html -delete
- bin/deploy.sh
+ bin/deploy.sh http
clean:
find http -type f -name \*.html -delete
diff --git a/bin/deploy.sh b/bin/deploy.sh
index ec0d4ec..4a5d451 100755
--- a/bin/deploy.sh
+++ b/bin/deploy.sh
@@ -1,8 +1,9 @@
#!/bin/bash
+LOCALPATH=$1
DEPLOYPATH=`cat config/deploy-path`
if [ -s config/deploy-pass ]
then
- sshpass -f config/deploy-pass rsync -urpP --delete http/ $DEPLOYPATH
+ sshpass -f config/deploy-pass rsync -urpP --delete $LOCALPATH/ $DEPLOYPATH
else
- rsync -urpP --delete http/ $DEPLOYPATH
+ rsync -urpP --delete $LOCALPATH/ $DEPLOYPATH
fi
diff --git a/docs/scripts.md b/docs/scripts.md
index 8c5ad05..d715671 100644
--- a/docs/scripts.md
+++ b/docs/scripts.md
@@ -100,4 +100,4 @@ Deployment scripts
`deploy.sh`
-Just run it to sync pages output directory with a remote location, via `rsync`. If `config/deploy-pass` is present, it's provided to rsync via `sshpass`. `config/deploy-path` defines remote path for sync.
+Just run it to sync pages output directory (script's parameter) with a remote location, via `rsync`. If `config/deploy-pass` is present, it's provided to rsync via `sshpass`. `config/deploy-path` defines remote path for sync.