From d3f537902dde6cacac5c9158b199f1712e4589b3 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Fri, 5 Jun 2015 21:58:31 +0300 Subject: [PATCH] Refactor update script --- update | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/update b/update index 5dca656..0322c1f 100755 --- a/update +++ b/update @@ -1,27 +1,9 @@ #! /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="`git config --get --path remote.current.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 +exec rsync -ahP "$current"/mimedecode.docbook "$current"/mimedecode.man \ + "$current"/mimedecode.html "$current"/mimedecode.txt . -- 2.39.2