fix build script

Signed-off-by: Michael Sverdlov <michaelsv@jfrog.com>
jfrog · Sep 21, 2023 · 58dbe50 · 58dbe50
1 parent e0f725a
commit 58dbe50
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 21 deletions.
diff --git a/build/deb_rpm/v2-jf/build-scripts/pack.sh b/build/deb_rpm/v2-jf/build-scripts/pack.sh
@@ -46,12 +46,11 @@ errorExit() {
 }
 
 checkDockerAccess() {
-	log "Checking docker" "DEBUG"
-	docker -v > /dev/null 2>&1 && docker ps > /dev/null 2>&1
-	if [ $? -ne 0 ]; then
-	    errorExit "Must run as user that can execute docker commands"
-	fi
-	log "Docker is available" "DEBUG"
+if docker -v > /dev/null 2>&1 && docker ps > /dev/null 2>&1; then
+    log "Docker is available" "DEBUG"
+else
+    errorExit "Must run as a user that can execute docker commands"
+fi
 }
 
 exitWithUsage(){

diff --git a/build/deb_rpm/v2/build-scripts/pack.sh b/build/deb_rpm/v2/build-scripts/pack.sh
@@ -46,12 +46,11 @@ errorExit() {
 }
 
 checkDockerAccess() {
-	log "Checking docker" "DEBUG"
-	docker -v > /dev/null 2>&1 && docker ps > /dev/null 2>&1
-	if [ $? -ne 0 ]; then
-	    errorExit "Must run as user that can execute docker commands"
-	fi
-	log "Docker is available" "DEBUG"
+if docker -v > /dev/null 2>&1 && docker ps > /dev/null 2>&1; then
+    log "Docker is available" "DEBUG"
+else
+    errorExit "Must run as a user that can execute docker commands"
+fi
 }
 
 exitWithUsage(){

diff --git a/build/installcli/jf.sh b/build/installcli/jf.sh
@@ -68,9 +68,7 @@ set -- "/usr/local/bin" "/usr/bin" "/opt/bin"
 while [ -n "$1" ]; do
     # Check if destination is in path.
     if echo "$PATH"|grep "$1" -> /dev/null ; then
-        mv $FILE_NAME "$1"
-        if [ "$?" -eq "0" ]
-        then
+        if mv $FILE_NAME "$1" ; then
             echo ""
             echo "The $FILE_NAME executable was installed in $1"
             jf intro

diff --git a/build/installcli/jfrog.sh b/build/installcli/jfrog.sh
@@ -68,9 +68,7 @@ set -- "/usr/local/bin" "/usr/bin" "/opt/bin"
 while [ -n "$1" ]; do
     # Check if destination is in path.
     if echo "$PATH"|grep "$1" -> /dev/null ; then
-        mv $FILE_NAME "$1"
-        if [ "$?" -eq "0" ]
-        then
+        if mv $FILE_NAME "$1" ; then
             echo ""
             echo "The $FILE_NAME executable was installed in $1"
             exit 0

diff --git a/build/setupcli/jf.sh b/build/setupcli/jf.sh
@@ -72,9 +72,7 @@ set -- "/usr/local/bin" "/usr/bin" "/opt/bin"
 while [ -n "$1" ]; do
     # Check if destination is in path.
     if echo "$PATH"|grep "$1" -> /dev/null ; then
-         mv $FILE_NAME "$1"
-         if [ "$?" -eq "0" ]
-        then
+         if mv $FILE_NAME "$1" ; then
             echo ""
             echo "The $FILE_NAME executable was installed in $1"
             print_installation_greeting