Yet more Sonarqube fixes.

pkg/linux/build-functions.sh

@@ -193,7 +193,7 @@ _build_docs() {
     cd "${SOURCEDIR}/docs/en_US" || exit
     python3 build_code_snippet.py
     SYS_PYTHONPATH=$(/usr/bin/python3 -c "import sys; print(':'.join([p for p in sys.path if p]))")
-    # shellcheck disable=SC2154
+    # shellcheck disable=SC2153
     if [ "$1" == "redhat" ] && [ "${OS_VERSION}" == "7" ]; then
             PYTHONPATH=$PYTHONPATH:${SYS_PYTHONPATH} python3 /usr/local/bin/sphinx-build . "${SERVERROOT}/usr/${APP_NAME}/share/docs/en_US/html"
     else

pkg/linux/setup-web.sh

@@ -9,7 +9,7 @@ if [ "$EUID" -ne 0 ]
   exit 1
 fi
 
-if [[ "$#" -ne 0 ]] && ([[ "$#" -eq 1 ]] && [[ "$1" != "--yes" ]]); then
+if [[ "$#" -gt 1 ]] || { [[ "$#" -eq 1 ]] && [[ "$1" != "--yes" ]]; }; then
     echo "Usage: $0 [--yes]"
     exit 1
 fi
@@ -128,8 +128,7 @@ if pgrep ${APACHE} > /dev/null; then
 
     case ${RESPONSE} in
         y|Y )
-            systemctl restart ${APACHE}
-            if [ $? != 0 ]; then
+            if ! systemctl restart ${APACHE}; then
                 echo "Error restarting ${APACHE}. Please check the systemd logs"
             else
                 echo "Apache successfully restarted. You can now start using pgAdmin 4 in web mode at http://127.0.0.1/pgadmin4"