From bd41a2fe1185ca4d6cf8c48659f7a8e15685750f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20G=C3=B3mez?= Date: Thu, 14 Apr 2022 22:12:45 -0500 Subject: [PATCH 1/2] Check profile-file exists before appending sdkman_init_snippet --- app/views/install_beta.scala.txt | 12 ++++-------- app/views/install_stable.scala.txt | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/app/views/install_beta.scala.txt b/app/views/install_beta.scala.txt index a089a7c..093be92 100644 --- a/app/views/install_beta.scala.txt +++ b/app/views/install_beta.scala.txt @@ -107,28 +107,24 @@ echo "$SDKMAN_NATIVE_VERSION" > "${SDKMAN_DIR}/var/version_native" @if(rcUpdate) { if [[ $darwin == true ]]; then - touch "$sdkman_bash_profile" echo "Attempt update of login bash profile on OSX..." - if [[ -z $(grep 'sdkman-init.sh' "$sdkman_bash_profile") ]]; then + if [[ -e "$sdkman_bash_profile" && -z $(grep 'sdkman-init.sh' "$sdkman_bash_profile") ]]; then echo -e "\n$sdkman_init_snippet" >> "$sdkman_bash_profile" echo "Added sdkman init snippet to $sdkman_bash_profile" fi else echo "Attempt update of interactive bash profile on regular UNIX..." - touch "${sdkman_bashrc}" - if [[ -z $(grep 'sdkman-init.sh' "$sdkman_bashrc") ]]; then + if [[ -e "${sdkman_bashrc}" && -z $(grep 'sdkman-init.sh' "$sdkman_bashrc") ]]; then echo -e "\n$sdkman_init_snippet" >> "$sdkman_bashrc" echo "Added sdkman init snippet to $sdkman_bashrc" fi fi echo "Attempt update of zsh profile..." -touch "$sdkman_zshrc" -if [[ -z $(grep 'sdkman-init.sh' "$sdkman_zshrc") ]]; then +if [[ -e "$sdkman_zshrc" && -z $(grep 'sdkman-init.sh' "$sdkman_zshrc") ]]; then echo -e "\n$sdkman_init_snippet" >> "$sdkman_zshrc" echo "Updated existing ${sdkman_zshrc}" fi - } -@includes.install_message(beta) \ No newline at end of file +@includes.install_message(beta) diff --git a/app/views/install_stable.scala.txt b/app/views/install_stable.scala.txt index aade15d..b27f4a3 100644 --- a/app/views/install_stable.scala.txt +++ b/app/views/install_stable.scala.txt @@ -112,28 +112,24 @@ echo "$SDKMAN_VERSION" > "${SDKMAN_DIR}/var/version" @if(rcUpdate) { if [[ $darwin == true ]]; then - touch "$sdkman_bash_profile" echo "Attempt update of login bash profile on OSX..." - if [[ -z $(grep 'sdkman-init.sh' "$sdkman_bash_profile") ]]; then + if [[ -e "$sdkman_bash_profile" && -z $(grep 'sdkman-init.sh' "$sdkman_bash_profile") ]]; then echo -e "\n$sdkman_init_snippet" >> "$sdkman_bash_profile" echo "Added sdkman init snippet to $sdkman_bash_profile" fi else echo "Attempt update of interactive bash profile on regular UNIX..." - touch "${sdkman_bashrc}" - if [[ -z $(grep 'sdkman-init.sh' "$sdkman_bashrc") ]]; then + if [[ -e "${sdkman_bashrc}" && -z $(grep 'sdkman-init.sh' "$sdkman_bashrc") ]]; then echo -e "\n$sdkman_init_snippet" >> "$sdkman_bashrc" echo "Added sdkman init snippet to $sdkman_bashrc" fi fi echo "Attempt update of zsh profile..." -touch "$sdkman_zshrc" -if [[ -z $(grep 'sdkman-init.sh' "$sdkman_zshrc") ]]; then +if [[ -e "$sdkman_zshrc" && -z $(grep 'sdkman-init.sh' "$sdkman_zshrc") ]]; then echo -e "\n$sdkman_init_snippet" >> "$sdkman_zshrc" echo "Updated existing ${sdkman_zshrc}" fi - } -@includes.install_message(beta) \ No newline at end of file +@includes.install_message(beta) From aad35d3f85ce1aa4f6c90b2d74e37c07a460e244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20G=C3=B3mez?= Date: Thu, 14 Apr 2022 22:32:08 -0500 Subject: [PATCH 2/2] Remove unused Local variable --- app/views/install_beta.scala.txt | 1 - app/views/install_stable.scala.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/app/views/install_beta.scala.txt b/app/views/install_beta.scala.txt index 093be92..550309a 100644 --- a/app/views/install_beta.scala.txt +++ b/app/views/install_beta.scala.txt @@ -27,7 +27,6 @@ sdkman_var_folder="${SDKMAN_DIR}/var" sdkman_candidates_folder="${SDKMAN_DIR}/candidates" sdkman_config_file="${sdkman_etc_folder}/config" sdkman_bash_profile="${HOME}/.bash_profile" -sdkman_profile="${HOME}/.profile" sdkman_bashrc="${HOME}/.bashrc" sdkman_zshrc="${ZDOTDIR:-${HOME}}/.zshrc" diff --git a/app/views/install_stable.scala.txt b/app/views/install_stable.scala.txt index b27f4a3..7251bfd 100644 --- a/app/views/install_stable.scala.txt +++ b/app/views/install_stable.scala.txt @@ -26,7 +26,6 @@ sdkman_archives_folder="${SDKMAN_DIR}/archives" sdkman_candidates_folder="${SDKMAN_DIR}/candidates" sdkman_config_file="${sdkman_etc_folder}/config" sdkman_bash_profile="${HOME}/.bash_profile" -sdkman_profile="${HOME}/.profile" sdkman_bashrc="${HOME}/.bashrc" sdkman_zshrc="${ZDOTDIR:-${HOME}}/.zshrc"