8 files changed, 8 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 7a13c17..aa0016e 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ tig:
         ln -s `pwd`/tigrc ~/.tigrc
         if [ ! -d "$(HOME)/git/tig" ]; then \
                 git clone --depth=100 --origin my git@github.com:typebrook/tig ~/git/tig; \
-                cd ~/git/tig && git remote add origin git@github.com:jonas/tig.git && \
+                cd ~/git/tig && git remote add origin git@github.com:jonas/tig.git; \
         fi
 
 zsh:
diff --git a/tools/check_upstream b/tools/init/check_upstream
index e9e8841..e9e8841 100755
--- a/tools/check_upstream
+++ b/tools/init/check_upstream
diff --git a/tools/load-settings.sh b/tools/init/load-settings.sh
index 66ec879..041941a 100755
--- a/tools/load-settings.sh
+++ b/tools/init/load-settings.sh
@@ -25,7 +25,7 @@ OSM_UTIL_DIR=$SETTING_DIR/tools/osm
 source $OSM_UTIL_DIR/osm
 
 # sync with important git repos
-$SETTING_DIR/tools/sync.sh
+$SETTING_DIR/tools/init/sync.sh
 
 # go
 PATH=$PATH:$HOME/go/bin
diff --git a/tools/sync.sh b/tools/init/sync.sh
index 00ed4b8..00ed4b8 100755
--- a/tools/sync.sh
+++ b/tools/init/sync.sh
diff --git a/tools/install.sh b/tools/install.sh
index 0b59e28..c765c62 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-set -e
+set -xe
 
 # Default settings
 SETTING_DIR=${SETTING_DIR:-~/settings}
@@ -16,12 +16,12 @@ if [ ! -d $SETTING_DIR ]; then
   }
 fi
 
-sed -i "\^# $REPO^, /^$/ d" $RCFILE
-echo "
+# Write initial commands into .bashrc or .zshrc
+sed -i'.bak' "\^# $REPO^, /^$/ d" $RCFILE
+cat >>$RCFILE <<EOF
 # $REPO
 export SETTING_DIR=$SETTING_DIR
-source \$SETTING_DIR/tools/load-settings.sh
-" >> $RCFILE && \
-source $RCFILE
+source \$SETTING_DIR/tools/init/load-settings.sh
+EOF
 
 cd "$SETTING_DIR" && make
diff --git a/tools/diff-highlight b/tools/misc/diff-highlight
index 08c88bb..08c88bb 100755
--- a/tools/diff-highlight
+++ b/tools/misc/diff-highlight
diff --git a/tools/mvt_decode.py b/tools/misc/mvt_decode.py
index 0f661dd..0f661dd 100644
--- a/tools/mvt_decode.py
+++ b/tools/misc/mvt_decode.py
diff --git a/tools/refresh-todo.sh b/tools/misc/refresh-todo.sh
index 7931536..7931536 100755
--- a/tools/refresh-todo.sh
+++ b/tools/misc/refresh-todo.sh