From 6427bc2a1177405e662725891aa319ed9bc36cb0 Mon Sep 17 00:00:00 2001
From: Hsieh Chin Fan <typebrook@gmail.com>
Date: Wed, 14 Jul 2021 11:46:03 +0800
Subject: update

---
 tools/init/check_upstream   | 2 +-
 tools/init/load-settings.sh | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'tools')

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
   echo "New commit at" "$1"
 fi
 
-echo "$(date)" check "$1" >> "$SETTING_DIR/log"
+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 @@
+# load custom aliases
+export SETTING_DIR=${SETTING_DIR:=$HOME/settings}
+source $SETTING_DIR/alias
+
+# Config shell
 if [[ $SHELL =~ zsh$ ]]; then
   setopt extended_glob
   fpath=($SETTING_DIR/zsh $fpath)
@@ -8,10 +13,6 @@ fi
 # set default editor
 export EDITOR=vim
 
-# load custom aliases
-SETTING_DIR=${SETTING_DIR:=$HOME/settings}
-source $SETTING_DIR/alias
-
 # Add custom scripts into PATH
 BIN_DIR=$HOME/bin
 PATH=$PATH:$BIN_DIR
-- 
cgit v1.2.3-70-g09d2