diff --git a/build/chocolatey/v2-jf/README.md b/build/chocolatey/v2-jf/README.md
index c85de6a4c..bc20431eb 100644
--- a/build/chocolatey/v2-jf/README.md
+++ b/build/chocolatey/v2-jf/README.md
@@ -24,13 +24,13 @@ choco pack version=<version>
 ```
 
 This will create the file _build/chocolatey/jfrog-cli.\<version\>.nupkg which can be
-installed with Chcolatey
+installed with Chocolatey
 
 ```powershell
 choco install jfrog-cli.<version>.nupkg
 ```
 
-See Chocolatey's official documenattion [here](https://chocolatey.org/docs/create-packages)
+See Chocolatey's official documentation [here](https://chocolatey.org/docs/create-packages)
 
 [choco-dockerfile-pr]: https://github.com/chocolatey/choco/pull/1153
 [choco-dockerfile]: https://github.com/chocolatey/choco/tree/master/docker
diff --git a/build/chocolatey/v2/README.md b/build/chocolatey/v2/README.md
index c85de6a4c..bc20431eb 100644
--- a/build/chocolatey/v2/README.md
+++ b/build/chocolatey/v2/README.md
@@ -24,13 +24,13 @@ choco pack version=<version>
 ```
 
 This will create the file _build/chocolatey/jfrog-cli.\<version\>.nupkg which can be
-installed with Chcolatey
+installed with Chocolatey
 
 ```powershell
 choco install jfrog-cli.<version>.nupkg
 ```
 
-See Chocolatey's official documenattion [here](https://chocolatey.org/docs/create-packages)
+See Chocolatey's official documentation [here](https://chocolatey.org/docs/create-packages)
 
 [choco-dockerfile-pr]: https://github.com/chocolatey/choco/pull/1153
 [choco-dockerfile]: https://github.com/chocolatey/choco/tree/master/docker
diff --git a/build/deb_rpm/v2-jf/build-scripts/pack.sh b/build/deb_rpm/v2-jf/build-scripts/pack.sh
index 952d4cd9c..06797775c 100755
--- a/build/deb_rpm/v2-jf/build-scripts/pack.sh
+++ b/build/deb_rpm/v2-jf/build-scripts/pack.sh
@@ -350,8 +350,13 @@ main(){
 
 	for flavour in $flavours; do
     createPackage "$flavour"
-    [[ "${flavour}" == "rpm" ]]             && rpmSign               || true
-    [[ "${JFROG_CLI_RUN_TEST}" == "true" ]] && runTests "${flavour}" || true
+    if [[ "${flavour}" == "rpm" ]]; then
+         rpmSign
+    fi
+
+    if [[ "${JFROG_CLI_RUN_TEST}" == "true" ]]; then
+         runTests "${flavour}"
+    fi
 	done
 
 	log "...and Done!"
diff --git a/build/deb_rpm/v2-jf/build-scripts/rpm-sign.sh b/build/deb_rpm/v2-jf/build-scripts/rpm-sign.sh
index 144756a68..f76d1d0c7 100755
--- a/build/deb_rpm/v2-jf/build-scripts/rpm-sign.sh
+++ b/build/deb_rpm/v2-jf/build-scripts/rpm-sign.sh
@@ -25,9 +25,12 @@ rpmInitSigning(){
 
     gpg --allow-secret-key-import --import "${gpgKeyFile}" && \
     gpg --export -a "${keyID}" > /tmp/tmpFile && \
-    rpm --import /tmp/tmpFile && \
-    rpm -q gpg-pubkey --qf '%{name}-%{version}-%{release} --> %{summary}\n' | grep "${keyID}" || \
-      { echo "ERROR: RPM signature initialization failed!" >&2; exit 1; }
+    if rpm --import /tmp/tmpFile && rpm -q gpg-pubkey --qf '%{name}-%{version}-%{release} --> %{summary}\n' | grep "${keyID}"; then
+        echo "RPM signature initialization succeeded."
+    else
+        echo "ERROR: RPM signature initialization failed!" >&2
+        exit 1
+    fi
 
     rpmEditRpmMacro "${keyID}" || \
       { echo "ERROR: Configuring rpm macro failed!" >&2; exit 1; }
diff --git a/build/deb_rpm/v2/build-scripts/pack.sh b/build/deb_rpm/v2/build-scripts/pack.sh
index 5d20b924f..c3038cb0d 100755
--- a/build/deb_rpm/v2/build-scripts/pack.sh
+++ b/build/deb_rpm/v2/build-scripts/pack.sh
@@ -350,8 +350,13 @@ main(){
 
 	for flavour in $flavours; do
     createPackage "$flavour"
-    [[ "${flavour}" == "rpm" ]]             && rpmSign               || true
-    [[ "${JFROG_CLI_RUN_TEST}" == "true" ]] && runTests "${flavour}" || true
+    if [[ "${flavour}" == "rpm" ]]; then
+         rpmSign
+    fi
+
+    if [[ "${JFROG_CLI_RUN_TEST}" == "true" ]]; then
+         runTests "${flavour}"
+    fi
 	done
 
 	log "...and Done!"
diff --git a/build/deb_rpm/v2/build-scripts/rpm-sign.sh b/build/deb_rpm/v2/build-scripts/rpm-sign.sh
index 144756a68..f76d1d0c7 100755
--- a/build/deb_rpm/v2/build-scripts/rpm-sign.sh
+++ b/build/deb_rpm/v2/build-scripts/rpm-sign.sh
@@ -25,9 +25,12 @@ rpmInitSigning(){
 
     gpg --allow-secret-key-import --import "${gpgKeyFile}" && \
     gpg --export -a "${keyID}" > /tmp/tmpFile && \
-    rpm --import /tmp/tmpFile && \
-    rpm -q gpg-pubkey --qf '%{name}-%{version}-%{release} --> %{summary}\n' | grep "${keyID}" || \
-      { echo "ERROR: RPM signature initialization failed!" >&2; exit 1; }
+    if rpm --import /tmp/tmpFile && rpm -q gpg-pubkey --qf '%{name}-%{version}-%{release} --> %{summary}\n' | grep "${keyID}"; then
+        echo "RPM signature initialization succeeded."
+    else
+        echo "ERROR: RPM signature initialization failed!" >&2
+        exit 1
+    fi
 
     rpmEditRpmMacro "${keyID}" || \
       { echo "ERROR: Configuring rpm macro failed!" >&2; exit 1; }