Refactor update script

[phdru.name/cgi-bin/blog-ru/search-tags.git] / update

diff --git a/update b/update
index 9d996d81a2ac9d24abfe235dc88c7097d8abf1a9..ad37f0cb3fa89932d62e10ab29e4aef185609442 100755 (executable)
--- a/update
+++ b/update
@@ -1,8 +1,23 @@
 #! /bin/sh
 
-current="`git config --get remote.current.url`" &&
+"$HOME"/admin/prog/git-scripts/update || exit 1
 
-git pull --ff-only current master && git push web &&
+current="`git config --get --path remote.current.url`"
 
-cd "$current" &&
-exec git pull origin
+# 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 &&
+
+# Copy files generated by yacc
+rsync -ahP "$current"/parser.out "$current"/parsetab.py . &&
+
+cgi="`git config --get --path remote.cgi.url`" &&
+if [ -n "$cgi" ]; then
+   umask 022 && cd "$cgi" && git pull origin &&
+   rsync -ahP "$current"/html/html.py "$current"/html/html.tmpl \
+              "$current"/html/redirect.py "$current"/html/redirect.tmpl html &&
+   rsync -ahP "$current"/parser.out "$current"/parsetab.py . &&
+   compyleall && chmod -R a+rX .
+fi &&
+
+cd "$current" && exec git pull origin