X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=update;h=dacee5a55eac1f846ed68a1d414935684749da59;hb=fa07ba5f0028c36e849f99eae9294eaa7a438945;hp=9d996d81a2ac9d24abfe235dc88c7097d8abf1a9;hpb=a5f3997e151ccecaf3a828fef4366f8d8dbbefc5;p=phdru.name%2Fcgi-bin%2Fblog-ru%2Fsearch-tags.git diff --git a/update b/update index 9d996d8..dacee5a 100755 --- a/update +++ b/update @@ -1,8 +1,26 @@ #! /bin/sh -current="`git config --get remote.current.url`" && +current="`git config --get --path remote.current.url`" +origin="`git config --get --path remote.origin.url`" -git pull --ff-only current master && git push web && +if [ -n "$origin" ]; then + if [ -n "$current" ]; then + echo "UNKNOWN ERROR" + else + echo "This script must be run in the origin directory: $origin" + fi >&2 + exit 1 +elif [ -z "$current" ]; then + echo "UNKNOWN ERROR" >&2 + exit 1 +fi -cd "$current" && -exec git pull origin +git pull --ff-only current master && + +web="`git config --get --path remote.web.url`" && +[ -n "$web" ] && git push web + +# Copy search_tags.* with timestamp to avoid rebuilding +rsync -ahP "$current"/search_tags.py "$current"/search_tags.tmpl . && + +cd "$current" && exec git pull origin