X-Git-Url: https://git.phdru.name/?p=git-scripts.git;a=blobdiff_plain;f=update;h=fd10a24b725bd744ab58db2f5282a70e05641b2e;hp=552c1e550e4cd9678e90f44e28b7295389670b41;hb=8bb709559b23d1da481df679eafe4bc9d078cd42;hpb=8f9a9f223be48dc7f20f3a7361ab606aba121895 diff --git a/update b/update index 552c1e5..fd10a24 100755 --- a/update +++ b/update @@ -5,19 +5,22 @@ origin="`git config --get --path remote.origin.url`" if [ -n "$origin" ]; then if [ -n "$current" ]; then - echo "UNKNOWN ERROR" + echo "Config error (both origin and current)" >&2 + exit 1 else - echo "This script must be run in the origin directory: $origin" - fi >&2 - exit 1 + cd "$origin" && + exec ./update + fi elif [ -z "$current" ]; then - echo "UNKNOWN ERROR" >&2 + echo "Wrong directory error (neither origin nor current)" >&2 exit 1 fi git pull --ff-only current master && web="`git config --get --path remote.web.url`" && -[ -n "$web" ] && git push web +if [ -n "$web" ]; then + git push web +fi && cd "$current" && exec git pull origin