summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2017-09-08 13:13:27 +0200
committeremkael <emkael@tlen.pl>2017-09-08 13:13:27 +0200
commitd94077ed47e62b71e2a16740d3a643582f642690 (patch)
treebb16a1a8971d1523cf7b654dd3fe22c3f4377936
parentab6ffe56eb47ab58c735f88de84cab6e98c8e311 (diff)
Ignore, not delete .menu.html files on deploy
-rw-r--r--Makefile1
-rwxr-xr-xbin/deploy.sh5
-rw-r--r--docs/scripts.md2
3 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 93a6e49..a918d5c 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,6 @@ $(tmpfiles):
mv $@ $(patsubst %.tmp,%,$@)
deploy:
- find http -type f -name .menu.html -delete
bin/deploy.sh http
clean:
diff --git a/bin/deploy.sh b/bin/deploy.sh
index 4a5d451..4467cd0 100755
--- a/bin/deploy.sh
+++ b/bin/deploy.sh
@@ -1,9 +1,10 @@
#!/bin/bash
LOCALPATH=$1
DEPLOYPATH=`cat config/deploy-path`
+RSYNCOPTS='-urpP --delete --exclude=.menu.html'
if [ -s config/deploy-pass ]
then
- sshpass -f config/deploy-pass rsync -urpP --delete $LOCALPATH/ $DEPLOYPATH
+ sshpass -f config/deploy-pass rsync $RSYNCOPTS $LOCALPATH/ $DEPLOYPATH
else
- rsync -urpP --delete $LOCALPATH/ $DEPLOYPATH
+ rsync $RSYNCOPTS $LOCALPATH/ $DEPLOYPATH
fi
diff --git a/docs/scripts.md b/docs/scripts.md
index fbec3f2..9b81285 100644
--- a/docs/scripts.md
+++ b/docs/scripts.md
@@ -119,3 +119,5 @@ Deployment scripts
`deploy.sh`
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.
+
+Temporary menu HTML snippet files are ignored while deploying.