Fix re-install

.devcontainer/Dockerfile

@@ -23,7 +23,8 @@ RUN groupadd --gid $USER_GID $USERNAME \
     && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
     && chmod 0440 /etc/sudoers.d/$USERNAME \
     && chown -R $USERNAME:$USERNAME /usr/local/cargo \
-    && chown -R $USERNAME:$USERNAME /usr/local/rustup
+    && chown -R $USERNAME:$USERNAME /usr/local/rustup \
+    && chsh -s /bin/bash $USERNAME
 USER $USERNAME
 
 # Source artifact to be ready to execute

README.md

@@ -68,7 +68,6 @@ You can customize key bindings using environment variables: `INTELLI_SEARCH_HOTK
 
 ## Wishlist
 
-- [ ] Option to auto-update to latest version
 - [ ] Labels support to store most used labels and select them using a dedicated UI
 - [ ] Pull / Push user bookmarks using some public / private Git repo
 - [ ] Support for more terminals, like PowerShell

install.sh

@@ -1,9 +1,9 @@
-set -e 
+set -eo pipefail
 
 # Retrieve default shell
 shell="${SHELL##*/}"
 
-if [[ "$shell" != "bash" ]] && [[ "$shell" != "zsh" ]];
+if [[ "$shell" != 'bash' ]] && [[ "$shell" != 'zsh' ]];
 then
   echo "Terminal $shell is not compatible";
   exit 1;
@@ -13,14 +13,14 @@ fi
 arch=$(uname -m)
 case "$OSTYPE" in
   linux*)   os="unknown-$OSTYPE" 
-            INTELLI_HOME="$HOME/.local/share/intelli-shell"
+            INTELLI_HOME="${INTELLI_HOME:-$HOME/.local/share/intelli-shell}"
             ;;
   darwin*)  os="apple-darwin" 
-            INTELLI_HOME="$HOME/Library/Application Support/org.IntelliShell.Intelli-Shell"
+            INTELLI_HOME="${INTELLI_HOME:-$HOME/Library/Application Support/org.IntelliShell.Intelli-Shell}"
             ;; 
   msys*)    os="pc-windows-msvc" 
             POSIX_APPDATA=$(echo "/$APPDATA" | sed 's/\\/\//g' | sed 's/://')
-            INTELLI_HOME="$POSIX_APPDATA/IntelliShell/Intelli-Shell"
+            INTELLI_HOME="${INTELLI_HOME:-$POSIX_APPDATA/IntelliShell/Intelli-Shell}"
             ;;
   *)        echo "OS type not supported: $OSTYPE" 
             exit 1 
@@ -32,20 +32,25 @@ target="$arch-$os"
 mkdir -p $INTELLI_HOME/bin
 curl -Lsf https://github.com/lasantosr/intelli-shell/releases/latest/download/intelli-shell-$target.tar.gz | tar zxf - -C $INTELLI_HOME/bin 
 
+echo "Successfully installed IntelliShell at: $INTELLI_HOME"
+
 # Update rc
-if [[ "$os" = "apple-darwin" ]] && [[ "$shell" = "bash" ]];
+if [[ "$os" = 'apple-darwin' ]] && [[ "$shell" = 'bash' ]];
 then
   rcfile=".bash_profile"
 else
   rcfile=".${shell}rc"
 fi
-echo -e '\n# IntelliShell' >> ~/$rcfile
-echo "INTELLI_HOME=$INTELLI_HOME" >> ~/$rcfile
-echo '# export INTELLI_SEARCH_HOTKEY=\C-@' >> ~/$rcfile
-echo '# export INTELLI_SAVE_HOTKEY=C-b' >> ~/$rcfile
-echo '# export INTELLI_SKIP_ESC_BIND=0' >> ~/$rcfile
-echo 'alias intelli-shell="$INTELLI_HOME/bin/intelli-shell"' >> ~/$rcfile
-echo 'source $INTELLI_HOME/bin/intelli-shell.sh' >> ~/$rcfile
+sourced=$(cat ~/$rcfile | { grep -E '^source.*intelli-shell\.sh' || test $? = 1; })
+if [[ -z "$sourced" ]];
+then
+  echo -e '\n# IntelliShell' >> ~/$rcfile
+  echo "INTELLI_HOME=$INTELLI_HOME" >> ~/$rcfile
+  echo '# export INTELLI_SEARCH_HOTKEY=\C-@' >> ~/$rcfile
+  echo '# export INTELLI_SAVE_HOTKEY=C-b' >> ~/$rcfile
+  echo '# export INTELLI_SKIP_ESC_BIND=0' >> ~/$rcfile
+  echo 'alias intelli-shell="$INTELLI_HOME/bin/intelli-shell"' >> ~/$rcfile
+  echo 'source $INTELLI_HOME/bin/intelli-shell.sh' >> ~/$rcfile
 
-echo "Successfully installed IntelliShell at: $INTELLI_HOME"
-echo "Please restart the terminal or re-source ~/$rcfile, where further customizations can be made"
+  echo "Please restart the terminal or re-source ~/$rcfile, where further customizations can be made"
+fi