aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rwxr-xr-xtools/init/check_upstream2
-rwxr-xr-xtools/init/load-settings.sh9
2 files changed, 6 insertions, 5 deletions
diff --git a/tools/init/check_upstream b/tools/init/check_upstream
index e9e8841..fa6d277 100755
--- a/tools/init/check_upstream
+++ b/tools/init/check_upstream
@@ -21,4 +21,4 @@ if ! git rev-list "$head" | grep "$(git rev-parse origin/master)" > /dev/null; t
21 echo "New commit at" "$1" 21 echo "New commit at" "$1"
22fi 22fi
23 23
24echo "$(date)" check "$1" >> "$SETTING_DIR/log" 24echo "$(date)" check "$1" >> "$SETTING_DIR/log" || echo error happens when check upstream at $1
diff --git a/tools/init/load-settings.sh b/tools/init/load-settings.sh
index 1990c1f..924559b 100755
--- a/tools/init/load-settings.sh
+++ b/tools/init/load-settings.sh
@@ -1,3 +1,8 @@
1# load custom aliases
2export SETTING_DIR=${SETTING_DIR:=$HOME/settings}
3source $SETTING_DIR/alias
4
5# Config shell
1if [[ $SHELL =~ zsh$ ]]; then 6if [[ $SHELL =~ zsh$ ]]; then
2 setopt extended_glob 7 setopt extended_glob
3 fpath=($SETTING_DIR/zsh $fpath) 8 fpath=($SETTING_DIR/zsh $fpath)
@@ -8,10 +13,6 @@ fi
8# set default editor 13# set default editor
9export EDITOR=vim 14export EDITOR=vim
10 15
11# load custom aliases
12SETTING_DIR=${SETTING_DIR:=$HOME/settings}
13source $SETTING_DIR/alias
14
15# Add custom scripts into PATH 16# Add custom scripts into PATH
16BIN_DIR=$HOME/bin 17BIN_DIR=$HOME/bin
17PATH=$PATH:$BIN_DIR 18PATH=$PATH:$BIN_DIR