diff --git a/rc.local/gitprompt.sh b/rc.local/gitprompt.sh index 45e090c..a77571b 100644 --- a/rc.local/gitprompt.sh +++ b/rc.local/gitprompt.sh @@ -1,3 +1,3 @@ -GIT_PROMPT_INIT="$HOME/.bash-git-prompt/gitprompt.sh" -GIT_PROMPT_ONLY_IN_REPO=1 +nop ${GIT_PROMPT_INIT:="$HOME/.bash-git-prompt/gitprompt.sh"} +nop ${GIT_PROMPT_ONLY_IN_REPO:=1} source_try "$GIT_PROMPT_INIT" diff --git a/rc.local/golang.sh.bak b/rc.local/golang.sh.bak index c382855..60b0faa 100644 --- a/rc.local/golang.sh.bak +++ b/rc.local/golang.sh.bak @@ -1,2 +1,4 @@ -prepend_path "$HOME/go/bin" -export GOROOT=$(go env GOROOT) +prepend_path_try "$HOME/go/bin" +if can_run go; then + export GOROOT=$(go env GOROOT) +fi diff --git a/rc.local/linuxbrew.sh b/rc.local/linuxbrew.sh index e4a0f44..3aa20c7 100644 --- a/rc.local/linuxbrew.sh +++ b/rc.local/linuxbrew.sh @@ -1,7 +1,7 @@ -BREW_HOME=/home/linuxbrew -BREW="$BREW_HOME/.linuxbrew/bin/brew" +nop ${BREW_HOME:=/home/linuxbrew} +nop ${BREW:="$BREW_HOME/.linuxbrew/bin/brew"} -if [[ -e $BREW ]]; then +if [[ -e "$BREW" ]]; then eval "$($BREW shellenv)" fi diff --git a/rc.local/sdkman.sh b/rc.local/sdkman.sh index 218a7d5..8d7e1ba 100644 --- a/rc.local/sdkman.sh +++ b/rc.local/sdkman.sh @@ -1,2 +1,3 @@ -export SDKMAN_DIR="/home/lachtan/.sdkman" +nop "${SDKMAN_DIR:=$HOME/.sdkman}" +export SDKMAN_DIR source_try "$SDKMAN_DIR/bin/sdkman-init.sh" diff --git a/rc.local/wsl.sh b/rc.local/wsl.sh index cc75082..bf94add 100644 --- a/rc.local/wsl.sh +++ b/rc.local/wsl.sh @@ -1,3 +1,3 @@ -prepend_path "$HOME/.local/bin" -append_path "$HOME/.arkade/bin" -append_path "$HOME/.cargo/bin" +prepend_path_try "$HOME/.local/bin" +append_path_try "$HOME/.arkade/bin" +append_path_try "$HOME/.cargo/bin"