aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authortypebrook <typebrook@gmail.com>2019-11-10 00:35:53 +0800
committertypebrook <typebrook@gmail.com>2019-11-10 00:35:53 +0800
commit6c135c1235c3ace511baee440ac6289a9495ff2d (patch)
treeb56c1dac493f2b69429de465653421535aee4dad
parent6e0c25edacd6ed2a9a5fc0136cb807f5e5c9ef36 (diff)
update
-rwxr-xr-xscripts/check_upstream1
-rwxr-xr-xscripts/load-settings.sh6
2 files changed, 6 insertions, 1 deletions
diff --git a/scripts/check_upstream b/scripts/check_upstream
index 9f20037..e96a450 100755
--- a/scripts/check_upstream
+++ b/scripts/check_upstream
@@ -4,7 +4,6 @@
4# check $1(repo) if upstream branch origin/master is 4# check $1(repo) if upstream branch origin/master is
5# ahead of local branch $2(default to dev) 5# ahead of local branch $2(default to dev)
6 6
7
8if [ ! -d $1 ]; then 7if [ ! -d $1 ]; then
9 return 0 8 return 0
10fi 9fi
diff --git a/scripts/load-settings.sh b/scripts/load-settings.sh
index 94e4bfc..1bc936f 100755
--- a/scripts/load-settings.sh
+++ b/scripts/load-settings.sh
@@ -5,5 +5,11 @@ fi
5# load custom aliases 5# load custom aliases
6source $SETTING_DIR/alias.sh 6source $SETTING_DIR/alias.sh
7 7
8# Add custom scripts into PATH
8PATH=$PATH:$SETTING_DIR/scripts 9PATH=$PATH:$SETTING_DIR/scripts
10
11# sync with important git repos
9$SETTING_DIR/scripts/sync.sh 12$SETTING_DIR/scripts/sync.sh
13
14# load custom functions
15source $SETTING_DIR/utils/osm