CBG-3783 don't output error if command doesn't exist by using variable (

#6902) * CBG-3783 don't output error if command doesn't exist by using variable * use more idiomatic shell
couchbase · Jun 20, 2024 · 6546862 · 6546862
1 parent b64d925
commit 6546862
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/service/sync_gateway_service_install.sh b/service/sync_gateway_service_install.sh
@@ -47,8 +47,7 @@ usage() {
 }
 
 ostype() {
-  lsb_release 2>&1 > /dev/null
-  if [ $? -eq 0 ]; then
+  if [ -x "$(command -v lsb_release)" ]; then
     OS=$(lsb_release -si)
     VER=$(lsb_release -sr)
   elif [ -f /etc/os-release ]; then

diff --git a/service/sync_gateway_service_uninstall.sh b/service/sync_gateway_service_uninstall.sh
@@ -36,8 +36,7 @@ usage() {
 }
 
 ostype() {
-  lsb_release 2>&1 > /dev/null
-  if [ $? -eq 0 ]; then
+  if [ -x "$(command -v lsb_release)" ]; then
     OS=$(lsb_release -si)
     VER=$(lsb_release -sr)
   elif [ -f /etc/os-release ]; then

diff --git a/service/sync_gateway_service_upgrade.sh b/service/sync_gateway_service_upgrade.sh
@@ -36,8 +36,7 @@ usage() {
 }
 
 ostype() {
-  lsb_release 2>&1 > /dev/null
-  if [ $? -eq 0 ]; then
+  if [ -x "$(command -v lsb_release)" ]; then
     OS=$(lsb_release -si)
     VER=$(lsb_release -sr)
   elif [ -f /etc/os-release ]; then