X-Git-Url: https://git.phdru.name/?p=bookmarks_db.git;a=blobdiff_plain;f=update;h=2ce5b5b2ff90918f6f230f9b29da7241ee2045ff;hp=a7aefa92c9de344375f86a78e6dd8815ff321d32;hb=71f7553119f3efe154d1154dd85f1ceecc46f641;hpb=fa0f65074563ba0fe38311f4b79787d15f0bee7c diff --git a/update b/update index a7aefa9..2ce5b5b 100755 --- a/update +++ b/update @@ -1,23 +1,6 @@ #! /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 - -cd "$current" && compyleall && exec git pull origin +current="`git config --get --path remote.current.url`" +cd "$current" && exec compyleall