From: Oleg Broytman <phd@phdru.name>
Date: Fri, 5 Jun 2015 18:58:30 +0000 (+0300)
Subject: Refactor update script
X-Git-Tag: v0.4~15
X-Git-Url: https://git.phdru.name/?p=phdru.name%2Fcgi-bin%2Fblog-ru%2Fsearch-tags.git;a=commitdiff_plain;h=7f6f7fc4b3511c3e3db008b203452b39f1824199

Refactor update script
---

diff --git a/update b/update
index 32dc34e..ad37f0c 100755
--- a/update
+++ b/update
@@ -1,24 +1,8 @@
 #! /bin/sh
 
-current="`git config --get --path remote.current.url`"
-origin="`git config --get --path remote.origin.url`"
-
-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
+"$HOME"/admin/prog/git-scripts/update || exit 1
 
-git pull --ff-only current master &&
-
-web="`git config --get --path remote.web.url`" &&
-[ -n "$web" ] && git push web
+current="`git config --get --path remote.current.url`"
 
 # Copy templates and generated files with timestamps to avoid rebuilding
 rsync -ahP "$current"/html/html.py "$current"/html/html.tmpl \