Fix logic error about checking shell

2 files changed, 6 insertions, 6 deletions

diff --git a/alias b/alias
index 9552de0..a620f4b 100644
--- a/alias
+++ b/alias
@@ -2,7 +2,7 @@
 
 # config
 alias al="vim $SETTING_DIR/alias && source $SETTING_DIR/alias"
-alias $(basename $SHELL)rc="vim ~/.$(basename $SHELL)rc && source ~/.$(basename $SHELL)rc"
+alias ${shell}rc="vim ~/.${shell}rc && source ~/.${shell}rc"
 alias vimrc='vim ~/.vimrc'
 alias tigrc="vim ~/.tigrc"
 alias muttrc='vim ~/.config/mutt/muttrc'
diff --git a/tools/init/load-settings.sh b/tools/init/load-settings.sh
index 4529751..83c3d58 100755
--- a/tools/init/load-settings.sh
+++ b/tools/init/load-settings.sh
@@ -1,18 +1,18 @@
+trap 'exit.sh' EXIT
+
 export SETTING_DIR=${SETTING_DIR:=$HOME/helper}
 export EDITOR=vim
 export TERM=xterm-256color
 export XDG_CONFIG_HOME=~/.config
 
-trap 'exit.sh' EXIT
+# Get current shell
+export shell=$(</proc/$$/cmdline tr -d '[\0\-]')
+shell=${shell##*/}
 
 # load custom aliases
 source $SETTING_DIR/alias
 [[ -d $SETTING_DIR/private ]] && for f in $SETTING_DIR/private/*; do source $f; done
 
-# Get current shell
-shell=$(</proc/$$/cmdline tr -d '[\0\-]')
-shell=${shell##*/}
-
 # Add custom scripts into PATH
 BIN_DIR=$HOME/bin
 PATH=$BIN_DIR:$PATH