Fix cosmetic issues in OCI scripts (#150)

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/DocSpace-buildtools/pulls/150 Co-authored-by: Vladimir Ischenko <[email protected]> Co-committed-by: Vladimir Ischenko <[email protected]>
ONLYOFFICE · Jan 16, 2025 · ea2e9c4 · ea2e9c4
1 parent 4c141f1
commit ea2e9c4
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/install/OneClickInstall/install-Debian.sh b/install/OneClickInstall/install-Debian.sh
@@ -110,7 +110,7 @@ while [ "$1" != "" ]; do
 			fi
 		;;
 
-		-? | -h | --help )
+		-h | -? | --help )
 			echo "  Usage $0 [PARAMETER] [[PARAMETER], ...]"
 			echo "    Parameters:"
 			echo "      -it, --installation_type          installation type (community|developer|enterprise)"

diff --git a/install/OneClickInstall/install-Debian/uninstall.sh b/install/OneClickInstall/install-Debian/uninstall.sh
@@ -17,7 +17,7 @@ if [[ "$DEP_CHOICE" =~ ^(y|yes|)$ ]]; then
 fi
 
 # Get packages to uninstall
-PACKAGES_TO_UNINSTALL=($(dpkg -l | awk '{print $2}' | grep -E "^(${package_sysname}|${product})" || true))
+mapfile -t PACKAGES_TO_UNINSTALL < <(dpkg -l | awk '{print $2}' | grep -E "^(${package_sysname}|${product})" || true)
 
 DEPENDENCIES=(
     nodejs dotnet-sdk-9.0 mysql-server mysql-client postgresql
@@ -26,7 +26,8 @@ DEPENDENCIES=(
 )
 
 if [ "$UNINSTALL_DEPENDENCIES" = true ]; then
-    PACKAGES_TO_UNINSTALL+=("${DEPENDENCIES[@]}" $(dpkg-query -W -f='${Package}\n' | grep -E "^postgresql(-[0-9]+)?(-.*)?$"))
+    PACKAGES_TO_UNINSTALL+=( "${DEPENDENCIES[@]}" )
+    mapfile -t -O "${#PACKAGES_TO_UNINSTALL[@]}" PACKAGES_TO_UNINSTALL < <(dpkg-query -W -f='${Package}\n' | grep -E "^postgresql(-[0-9]+)?(-.*)?$")
 fi
 
 # Uninstall packages and clean up

diff --git a/install/OneClickInstall/install-Docker.sh b/install/OneClickInstall/install-Docker.sh
@@ -515,7 +515,7 @@ while [ "$1" != "" ]; do
 			fi
 		;;
 
-		-? | -h | --help )
+		-h | -? | --help )
 			echo "  Usage: bash $HELP_TARGET [PARAMETER] [[PARAMETER], ...]"
 			echo
 			echo "    Parameters:"

diff --git a/install/OneClickInstall/install-RedHat.sh b/install/OneClickInstall/install-RedHat.sh
@@ -111,7 +111,7 @@ while [ "$1" != "" ]; do
 			fi
 		;;
 
-		-? | -h | --help )
+		-h | -? | --help )
 			echo "  Usage $0 [PARAMETER] [[PARAMETER], ...]"
 			echo "    Parameters:"
 			echo "      -it, --installation_type          installation type (community|developer|enterprise)"

diff --git a/install/OneClickInstall/install-RedHat/install-preq.sh b/install/OneClickInstall/install-RedHat/install-preq.sh
@@ -18,7 +18,7 @@ ${package_manager} -y install yum-utils
 { yum check-update postgresql; PSQLExitCode=$?; } || true #Checking for postgresql update
 { yum check-update "$DIST"*-release; exitCode=$?; } || true #Checking for distribution update
 
-if rpm -qa | grep mariadb.*config >/dev/null 2>&1; then
+if rpm -qa | grep 'mariadb.*config' >/dev/null 2>&1; then
    echo "$RES_MARIADB" && exit 0
 fi
 

diff --git a/install/OneClickInstall/install-RedHat/uninstall.sh b/install/OneClickInstall/install-RedHat/uninstall.sh
@@ -17,7 +17,7 @@ if [[ "$DEP_CHOICE" =~ ^(y|yes|)$ ]]; then
 fi
 
 # Get packages to uninstall
-PACKAGES_TO_UNINSTALL=($(rpm -qa | grep -E "^(${package_sysname}|${product})" || true))
+mapfile -t PACKAGES_TO_UNINSTALL < <(rpm -qa | grep -E "^(${package_sysname}|${product})" || true)
 
 DEPENDENCIES=(
     nodejs dotnet-sdk-9.0 mysql-community-server postgresql