Merge branch 'develop' into 'main'

Merge 'develop' 'into 'master'

See merge request passbolt/passbolt-ops/passbolt-dep-scripts!31

Author: dlen

.gitlab-ci/test.yml

@@ -34,7 +34,7 @@
     ZYPPER_OPTIONS: ""
     SUSE_PACKAGE: ""
   script:
-    - ${PACKAGE_MANAGER} install -y which ncurses procps ${SUSE_PACKAGE}
+    - ${PACKAGE_MANAGER} install -y ncurses procps ${SUSE_PACKAGE}
     - bash passbolt-repo-setup."${PASSBOLT_FLAVOUR}".sh
     - ${PACKAGE_MANAGER} ${ZYPPER_OPTIONS} install -y passbolt-"${PASSBOLT_FLAVOUR}"-server
 

passbolt-repo-setup.ce.sh

@@ -141,13 +141,13 @@ os_detect () {
       then
           CODENAME="focal"
       fi
-  elif which zypper > /dev/null 2>&1
+  elif command -v zypper >/dev/null 2>&1
   then
       PACKAGE_MANAGER=zypper
-  elif which dnf > /dev/null 2>&1
+  elif command -v dnf >/dev/null 2>&1
   then
       PACKAGE_MANAGER=dnf
-  elif which yum > /dev/null 2>&1
+  elif command -v yum >/dev/null 2>&1
   then
       PACKAGE_MANAGER=yum
   else
@@ -193,7 +193,6 @@ install_dependencies () {
         # adding module web scripting repo and his dependency module server application for PHP
         # SUSEConnect --product sle-module-server-applications/15.6/x86_64
         # SUSEConnect --product sle-module-web-scripting/15.6/x86_64
-        # SUSEConnect --product PackageHub/15.6/x86_64
         # download the prerequisites packages
         ${PACKAGE_MANAGER} --non-interactive install php8-fpm php8
         # create a default default php-fpm conf as it is required during the installer

passbolt-repo-setup.pro.sh

@@ -141,13 +141,13 @@ os_detect () {
       then
           CODENAME="focal"
       fi
-  elif which zypper > /dev/null 2>&1
+  elif command -v zypper >/dev/null 2>&1
   then
       PACKAGE_MANAGER=zypper
-  elif which dnf > /dev/null 2>&1
+  elif command -v dnf >/dev/null 2>&1
   then
       PACKAGE_MANAGER=dnf
-  elif which yum > /dev/null 2>&1
+  elif command -v yum >/dev/null 2>&1
   then
       PACKAGE_MANAGER=yum
   else
@@ -193,7 +193,6 @@ install_dependencies () {
         # adding module web scripting repo and his dependency module server application for PHP
         # SUSEConnect --product sle-module-server-applications/15.6/x86_64
         # SUSEConnect --product sle-module-web-scripting/15.6/x86_64
-        # SUSEConnect --product PackageHub/15.6/x86_64
         # download the prerequisites packages
         ${PACKAGE_MANAGER} --non-interactive install php8-fpm php8
         # create a default default php-fpm conf as it is required during the installer