X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=update;h=d668175cdfa160f01965c579877ea717ff709cf1;hb=c7e506be9b8c785dbdfae35247e5f3ed5c0e90f0;hp=9d996d81a2ac9d24abfe235dc88c7097d8abf1a9;hpb=a5f3997e151ccecaf3a828fef4366f8d8dbbefc5;p=phdru.name%2Fcgi-bin%2Fblog-ru%2Fsearch-tags.git

diff --git a/update b/update
index 9d996d8..d668175 100755
--- a/update
+++ b/update
@@ -1,8 +1,27 @@
 #! /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 templates and generated files with timestamps to avoid rebuilding
+rsync -ahP "$current"/html/html.py "$current"/html/html.tmpl \
+           "$current"/html/redirect.py "$current"/html/redirect.tmpl html &&
+
+cd "$current" && exec git pull origin