fix scripts

rtancman · Feb 19, 2025 · fb25abd · fb25abd
1 parent 2ff4743
commit fb25abd
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/sh/osx/scripts/google-cloud-sdk.sh b/sh/osx/scripts/google-cloud-sdk.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-GCPSDK_IS_AVAILABLE="$(gcloud --version 2>&1 >/dev/null)"
+GCPSDK_IS_AVAILABLE="$(gcloud version 2>&1 >/dev/null)"
 
 if [[ ${GCPSDK_IS_AVAILABLE} == '' ]]; then
 

diff --git a/sh/osx/scripts/intellij_idea_ce.sh b/sh/osx/scripts/intellij_idea_ce.sh
@@ -2,7 +2,7 @@
 
 INTELLIJ_IDEA_CE_IS_AVAILABLE="$(brew list --cask | grep intellij-idea-ce)"
 
-if [[ ${INTELLIJ_IDEA_CE_IS_AVAILABLE} == 'intellij idea ce' ]]; then
+if [[ ${INTELLIJ_IDEA_CE_IS_AVAILABLE} == 'intellij-idea-ce' ]]; then
 
     echo -e "${bakgrn}[installed][intellij idea ce]${txtrst}" ;
 

diff --git a/sh/osx/scripts/kubectl.sh b/sh/osx/scripts/kubectl.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-KUBECTL_IS_AVAILABLE="$(kubectl --version 2>&1 >/dev/null)"
+KUBECTL_IS_AVAILABLE="$(kubectl version 2>&1 >/dev/null)"
 
 if [[ ${KUBECTL_IS_AVAILABLE} == '' ]]; then
 

diff --git a/sh/osx/scripts/nss.sh b/sh/osx/scripts/nss.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-NSS_IS_AVAILABLE="$(brew list | grep nss)"
+NSS_IS_AVAILABLE="$(brew list | grep nss | head -n1)"
 
 if [[ ${NSS_IS_AVAILABLE} == 'nss' ]]; then
 

diff --git a/sh/osx/scripts/postgresql.sh b/sh/osx/scripts/postgresql.sh
@@ -1,18 +1,18 @@
 #!/bin/sh
 
-POSTGRESQL_IS_AVAILABLE="$(postgres --version 2>&1 >/dev/null)"
+POSTGRESQL_IS_AVAILABLE="$(brew list | grep postgresql)"
 
-if [[ ${POSTGRESQL_IS_AVAILABLE} == '' ]]; then
+if [[ ${POSTGRESQL_IS_AVAILABLE} == "postgresql*" ]]; then
     echo -e "${bakgrn}[installed][postgresql]${txtrst}" ;
 else
     echo -e "${bakcyn}[postgresql] Start Install ${txtrst}";
     brew install postgresql@15
     echo -e "${bakgrn}[postgresql] Finish Install ${txtrst}";
 fi
 
-PGADMIN_IS_AVAILABLE="$(brew list --cask | grep pgadmin4 2>&1 >/dev/null)"
+PGADMIN_IS_AVAILABLE="$(brew list --cask | grep pgadmin4)"
 
-if [[ ${PGADMIN_IS_AVAILABLE} == '' ]]; then
+if [[ ${PGADMIN_IS_AVAILABLE} == 'pgadmin4' ]]; then
     echo -e "${bakgrn}[installed][pgadmin4]${txtrst}" ;
 else
     echo -e "${bakcyn}[pgadmin4] Start Install ${txtrst}";

diff --git a/sh/osx/scripts/virtualbox.sh b/sh/osx/scripts/virtualbox.sh
@@ -1,16 +1,16 @@
 #!/bin/sh
 
-VIRTUALBOX_IS_AVAILABLE="$(vbox-img --version 2>&1 >/dev/null)"
+VIRTUALBOX_IS_AVAILABLE="$(brew list --cask | grep virtualbox)"
 
-if [[ ${VIRTUALBOX_IS_AVAILABLE} == '' ]]; then
+if [[ ${VIRTUALBOX_IS_AVAILABLE} == 'virtualbox' ]]; then
 
     echo -e "${bakgrn}[installed][virtualbox]${txtrst}" ;
 
 else
 
     echo -e "${bakcyn}[virtualbox] Start Install ${txtrst}";
 
-    brew install virtualbox virtualbox-extension-pack --cask
+    brew install --cask virtualbox
 
     echo -e "${bakgrn}[virtualbox] Finish Install ${txtrst}";