From d94077ed47e62b71e2a16740d3a643582f642690 Mon Sep 17 00:00:00 2001 From: emkael Date: Fri, 8 Sep 2017 13:13:27 +0200 Subject: Ignore, not delete .menu.html files on deploy --- Makefile | 1 - bin/deploy.sh | 5 +++-- docs/scripts.md | 2 ++ 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. -- cgit v1.2.3