X-Git-Url: https://git.phdru.name/?p=phdru.name%2Fphdru.name.git;a=blobdiff_plain;f=update;h=552c1e550e4cd9678e90f44e28b7295389670b41;hp=9d996d81a2ac9d24abfe235dc88c7097d8abf1a9;hb=98fe10e1a6e8e29731ff72d9859701563b772c8b;hpb=fce673d158fab479a6c1f8819b1af495ec7a1932 diff --git a/update b/update index 9d996d8..552c1e5 100755 --- a/update +++ b/update @@ -1,8 +1,23 @@ #! /bin/sh -current="`git config --get remote.current.url`" && +current="`git config --get --path remote.current.url`" +origin="`git config --get --path remote.origin.url`" -git pull --ff-only current master && git push web && +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 -cd "$current" && -exec git pull origin +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