X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=update;h=fd10a24b725bd744ab58db2f5282a70e05641b2e;hb=77bef1e2535afe8c9ac98f9f5e090de73a7f4132;hp=2e0aa7843953217b66a23dffddef3dfa47f664d6;hpb=e67318dc6dd11c0d9d2f24badb0c14a4ce85a654;p=git-scripts.git diff --git a/update b/update index 2e0aa78..fd10a24 100755 --- a/update +++ b/update @@ -5,14 +5,14 @@ origin="`git config --get --path remote.origin.url`" if [ -n "$origin" ]; then if [ -n "$current" ]; then - echo "UNKNOWN ERROR (both origin and current)" >&2 + echo "Config error (both origin and current)" >&2 exit 1 else - cd "$origin" || exit 1 + cd "$origin" && exec ./update fi elif [ -z "$current" ]; then - echo "UNKNOWN ERROR (neither origin nor current)" >&2 + echo "Wrong directory error (neither origin nor current)" >&2 exit 1 fi @@ -20,7 +20,7 @@ git pull --ff-only current master && web="`git config --get --path remote.web.url`" && if [ -n "$web" ]; then - git push web master + git push web fi && cd "$current" && exec git pull origin