diff --git a/commit b/commit new file mode 100755 index 0000000..e93f74c --- /dev/null +++ b/commit @@ -0,0 +1,16 @@ +#!/bin/env bash + +if [[ $(hostname) != "ladd76" ]]; then + echo >&2 "host $(hostname) != 'ladd76'" + exit 1 +fi + +set -eo pipefail + +git checkout dev +./sync +git add . +git commit +git push +ssh lentilz 'cd ~/code/gravity-dev && git stash && git pull && git apply stash && npm i' + diff --git a/merge b/merge new file mode 100755 index 0000000..ec61868 --- /dev/null +++ b/merge @@ -0,0 +1,17 @@ +#!/bin/env bash + +if [[ $(hostname) != "ladd76" ]]; then + echo >&2 "host $(hostname) != 'ladd76'" + exit 1 +fi + +set -eo pipefail + +./commit +git checkout main +git pull +git merge dev +git push +git checkout dev +ssh lentilz 'cd ~/code/gravity-live && git pull' + diff --git a/sync b/sync new file mode 100755 index 0000000..4ec24c4 --- /dev/null +++ b/sync @@ -0,0 +1,9 @@ +#!/bin/env bash + +if [[ $(hostname) != "ladd76" ]]; then + echo >&2 "host $(hostname) != 'ladd76'" + exit 1 +fi + +rsync -ru --exclude='.git' --exclude='node_modules' ~/code/gravity-dev/ lentilz:code/gravity-dev/ +rsync -ru --exclude='.git' --exclude='node_modules' lentilz:code/gravity-dev/ ~/code/gravity-dev/