X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=update;h=a7aefa92c9de344375f86a78e6dd8815ff321d32;hb=fa0f65074563ba0fe38311f4b79787d15f0bee7c;hp=9d996d81a2ac9d24abfe235dc88c7097d8abf1a9;hpb=08b05bfe7f2f6d413510a30b79dbdecd948bd75c;p=bookmarks_db.git diff --git a/update b/update index 9d996d8..a7aefa9 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" && compyleall && exec git pull origin