Fix cosmetic issues in OCI scripts (#149)

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

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/install/OneClickInstall/install-Debian.sh b/install/OneClickInstall/install-Debian.sh
@@ -174,7 +174,7 @@ else
 fi
 
 # add onlyoffice repo
-mkdir -p -m 700 "$HOME"/.gnupg
+mkdir -p "$HOME/.gnupg" && chmod 700 "$HOME/.gnupg"
 echo "deb [signed-by=/usr/share/keyrings/onlyoffice.gpg] http://download.onlyoffice.com/repo/debian squeeze main" | tee /etc/apt/sources.list.d/onlyoffice.list
 curl -fsSL https://download.onlyoffice.com/GPG-KEY-ONLYOFFICE | gpg --no-default-keyring --keyring gnupg-ring:/usr/share/keyrings/onlyoffice.gpg --import
 chmod 644 /usr/share/keyrings/onlyoffice.gpg

diff --git a/install/OneClickInstall/install-Debian/tools.sh b/install/OneClickInstall/install-Debian/tools.sh
@@ -68,7 +68,7 @@ check_hardware () {
 
 	CPU_CORES_NUMBER=$(grep -c ^processor /proc/cpuinfo)
 
-	if [ ${CPU_CORES_NUMBER} -lt ${CORE_REQUIREMENTS} ]; then
+	if [ "${CPU_CORES_NUMBER}" -lt ${CORE_REQUIREMENTS} ]; then
 		echo "The system does not meet the minimal hardware requirements. CPU with at least $CORE_REQUIREMENTS cores is required"
 		exit 1
 	fi

diff --git a/install/OneClickInstall/install-RedHat/install-preq.sh b/install/OneClickInstall/install-RedHat/install-preq.sh
@@ -104,7 +104,7 @@ if [[ $PSQLExitCode -eq $UPDATE_AVAILABLE_CODE ]]; then
 	yum -y install postgresql-upgrade
 	postgresql-setup --upgrade || true
 fi
-postgresql-setup initdb	|| true
+postgresql-setup --initdb || true
 
 sed -E -i "s/(host\s+(all|replication)\s+all\s+(127\.0\.0\.1\/32|\:\:1\/128)\s+)(ident|trust|md5)/\1scram-sha-256/" /var/lib/pgsql/data/pg_hba.conf
 sed -i "s/^#\?password_encryption = .*/password_encryption = 'scram-sha-256'/" /var/lib/pgsql/data/postgresql.conf

diff --git a/install/OneClickInstall/install-RedHat/tools.sh b/install/OneClickInstall/install-RedHat/tools.sh
@@ -74,7 +74,7 @@ if [ "$DIST" == "fedora" ]; then
 	OPENRESTY_REV=$([ "$REV" -ge 37 ] && echo 36 || echo "$REV")
 
 	FEDORA_SUPP=$(curl https://docs.fedoraproject.org/en-US/releases/ | awk '/Supported Releases/,/EOL Releases/' | grep -oP 'F\d+' | tr -d 'F')
-	[ ! "$(echo "$FEDORA_SUPP" | grep "$REV")" ] && SUPPORTED_FEDORA_FLAG="false"
+	echo "$FEDORA_SUPP" | grep -q "$REV" || SUPPORTED_FEDORA_FLAG="false"
 fi
 
 # Check if it's Centos less than 8 or Fedora release is out of service

diff --git a/tests/vagrant/install.sh b/tests/vagrant/install.sh
@@ -272,7 +272,7 @@ function healthcheck_general_status() {
 # This function succeeds even if the file for cat was not found. For that use ${SKIP_EXIT} variable
 #############################################################################################
 function services_logs() {
-  SERVICES_SYSTEMD=($(awk '/SERVICE_NAME=\(/{flag=1; next} /\)/{flag=0} flag' "build.sh" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//' | sed 's/^/docspace-/' | sed 's/$/.service/'))
+  mapfile -t SERVICES_SYSTEMD < <(awk '/SERVICE_NAME=\(/{flag=1; next} /\)/{flag=0} flag' "build.sh" | sed -E 's/^[[:space:]]*|[[:space:]]*$//g; s/^/docspace-/; s/$/.service/')
   SERVICES_SYSTEMD+=("ds-converter.service" "ds-docservice.service" "ds-metrics.service")
 
   for service in "${SERVICES_SYSTEMD[@]}"; do