X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=update;h=2ce5b5b2ff90918f6f230f9b29da7241ee2045ff;hb=3fd429705afe1f7b1e9837624a3d1d724891a843;hp=26ea726c0fefd5c2b354ee0bcf3a9bfce397b8ee;hpb=cbf4c2c1db0af3829e015d895eb4ae02ecb8fc8e;p=bookmarks_db.git diff --git a/update b/update index 26ea726..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 && compyleall && +"$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