From: Oleg Broytman <phd@phdru.name>
Date: Fri, 5 Jun 2015 18:58:32 +0000 (+0300)
Subject: Refactor update script
X-Git-Tag: v5.0.0~26
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=6bfe0a72a41842cfd0a3c9c86eeb6f297e9ac437;p=xsetbg.git

Refactor update script
---

diff --git a/update b/update
index 552c1e5..690ecaa 100755
--- a/update
+++ b/update
@@ -1,23 +1,2 @@
 #! /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
-
-git pull --ff-only current master &&
-
-web="`git config --get --path remote.web.url`" &&
-[ -n "$web" ] && git push web
-
-cd "$current" && exec git pull origin
+exec "$HOME"/admin/prog/git-scripts/update