X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=update;h=5dca656d7bba7d734a4d907dd6346b65e35559c3;hb=f0f753ad009f6bd7089e0d6d3fce3ffd111734f5;hp=e511395b6d39f108b04f2c96744eec2280be8892;hpb=778044bae5c7740369607b822d27ece4c405b847;p=mimedecode.git diff --git a/update b/update index e511395..5dca656 100755 --- a/update +++ b/update @@ -1,12 +1,27 @@ #! /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 + +git pull --ff-only current master && + +web="`git config --get --path remote.web.url`" && +[ -n "$web" ] && git push web # 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 "$current" && exec git pull origin