X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=update;h=e026690663039911fd6335fbd6116f7371dc5283;hb=049f238d8b23e2ab7f543b33d52dd2544ffa7b22;hp=5dca656d7bba7d734a4d907dd6346b65e35559c3;hpb=b3623c1fda898c628c13bccda8d4b9fdcbadf59f;p=mimedecode.git

diff --git a/update b/update
index 5dca656..e026690 100755
--- a/update
+++ b/update
@@ -1,27 +1,11 @@
 #! /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 &&
+"$HOME"/admin/prog/git-scripts/update || exit 1
 
-web="`git config --get --path remote.web.url`" &&
-[ -n "$web" ] && git push web
+current="`pwd`"
+origin="`git config --get --path remote.origin.url`"
 
 # Copy mimedecode.docbook with timestamp to avoid rebuilding
-rsync -ahP "$current"/mimedecode.docbook "$current"/mimedecode.man \
-           "$current"/mimedecode.html "$current"/mimedecode.txt . &&
-
-cd "$current" && exec git pull origin
+cd "$origin"
+exec rsync -ahP "$current"/mimedecode.docbook "$current"/mimedecode.man \
+                "$current"/mimedecode.html "$current"/mimedecode.txt .