From bc0a2f2da04af80cc74f49750c90a11240562da4 Mon Sep 17 00:00:00 2001 From: Kalle Struik Date: Sat, 20 Aug 2022 16:37:54 +0200 Subject: [PATCH] Add fzf in bash, add sdkman in .bashrc (still needs section in install script), and fix cd-projects function to work with spaces in project names --- bash/.bashrc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/bash/.bashrc b/bash/.bashrc index 1431287..265eef9 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -1,3 +1,7 @@ + +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + # Add ~/bin and ~/bin/scripts to my path export PATH=$PATH:$HOME/bin/:$HOME/bin/scripts/ @@ -104,7 +108,7 @@ ${PROMPT_SYMBOL} " PROMPT_COMMAND=set_bash_prompt # fzf is love, fzf is life. -source /usr/share/bash-completion/completions/fzf-key-bindings +source /usr/share/fzf/key-bindings.bash function cdl() { cd $@ @@ -114,7 +118,7 @@ function cdl() { # Functions function cd-projects { dir=$(find ~/Projects -maxdepth 3 -type d | fzf) - cd $dir + cd "$dir" } # Aliases @@ -122,3 +126,7 @@ alias gg="git log --graph --abbrev-commit --decorate --format=format:'%C(bold bl alias gca="git add -A; git commit -a --amend --no-edit" alias gs="git status" alias proj="cd-projects" + +#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! +export SDKMAN_DIR="$HOME/.sdkman" +[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh"