diff options
| author | typebrook <typebrook@gmail.com> | 2019-10-14 17:48:48 +0800 |
|---|---|---|
| committer | typebrook <typebrook@gmail.com> | 2019-10-14 17:48:48 +0800 |
| commit | cd49acb301200aff338b8bd05018ef8af19f552a (patch) | |
| tree | 117c7ae7b23dbc858fa7139124fa3e919e0e5004 /scripts | |
| parent | ae69fefb4b83cecf7b5cba928e64f761853edd83 (diff) | |
update
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/check_upstream.sh | 2 | ||||
| -rwxr-xr-x | scripts/sync.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/check_upstream.sh b/scripts/check_upstream.sh index 3ebf3dd..84adb9e 100755 --- a/scripts/check_upstream.sh +++ b/scripts/check_upstream.sh | |||
| @@ -14,7 +14,7 @@ check_upstream() { | |||
| 14 | head=$2 | 14 | head=$2 |
| 15 | fi | 15 | fi |
| 16 | 16 | ||
| 17 | cd ~/$1 | 17 | cd $1 |
| 18 | git fetch origin && \ | 18 | git fetch origin && \ |
| 19 | git rev-list $head | grep $(git rev-parse origin/master) > /dev/null | 19 | git rev-list $head | grep $(git rev-parse origin/master) > /dev/null |
| 20 | 20 | ||
diff --git a/scripts/sync.sh b/scripts/sync.sh index 26abc22..665acba 100755 --- a/scripts/sync.sh +++ b/scripts/sync.sh | |||
| @@ -5,5 +5,5 @@ source $DIR/check_upstream.sh | |||
| 5 | 5 | ||
| 6 | cd ~/git/settings && git pull --quiet & | 6 | cd ~/git/settings && git pull --quiet & |
| 7 | cd ~/vimwiki && git pull --quiet & | 7 | cd ~/vimwiki && git pull --quiet & |
| 8 | check_upstream git/tig & | 8 | check_upstream ~/git/tig & |
| 9 | check_upstream .vim_runtime & | 9 | check_upstream ~/.vim_runtime & |