diff options
| author | Hsieh Chin Fan <typebrook@gmail.com> | 2021-07-14 11:46:03 +0800 |
|---|---|---|
| committer | Hsieh Chin Fan <typebrook@gmail.com> | 2021-07-14 11:46:03 +0800 |
| commit | 6427bc2a1177405e662725891aa319ed9bc36cb0 (patch) | |
| tree | 5741d64c86d7660bf35277bf041c3eb38b3e801c | |
| parent | 1fc01072ba2016049882a22b558eaa361833666b (diff) | |
update
| -rwxr-xr-x | tools/init/check_upstream | 2 | ||||
| -rwxr-xr-x | tools/init/load-settings.sh | 9 |
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" |
| 22 | fi | 22 | fi |
| 23 | 23 | ||
| 24 | echo "$(date)" check "$1" >> "$SETTING_DIR/log" | 24 | echo "$(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 | ||
| 2 | export SETTING_DIR=${SETTING_DIR:=$HOME/settings} | ||
| 3 | source $SETTING_DIR/alias | ||
| 4 | |||
| 5 | # Config shell | ||
| 1 | if [[ $SHELL =~ zsh$ ]]; then | 6 | if [[ $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 |
| 9 | export EDITOR=vim | 14 | export EDITOR=vim |
| 10 | 15 | ||
| 11 | # load custom aliases | ||
| 12 | SETTING_DIR=${SETTING_DIR:=$HOME/settings} | ||
| 13 | source $SETTING_DIR/alias | ||
| 14 | |||
| 15 | # Add custom scripts into PATH | 16 | # Add custom scripts into PATH |
| 16 | BIN_DIR=$HOME/bin | 17 | BIN_DIR=$HOME/bin |
| 17 | PATH=$PATH:$BIN_DIR | 18 | PATH=$PATH:$BIN_DIR |