From b739f558eb8fee8090015d3cf54a98b8e8a3f8d0 Mon Sep 17 00:00:00 2001
From: Adam Saleh <adam@asaleh.net>
Date: Nov 03 2022 13:01:55 +0000
Subject: Various stream 8 and 9 fixes


---

diff --git a/tests/p_curl/0-install_curl.sh b/tests/p_curl/0-install_curl.sh
index 555a439..3503caf 100755
--- a/tests/p_curl/0-install_curl.sh
+++ b/tests/p_curl/0-install_curl.sh
@@ -4,7 +4,10 @@
 
 t_Log "$0 - installing curl"
 if [ "$centos_ver" -ge "9" ]; then
-  t_InstallPackage curl-minimal
+  binary=$(which curl)
+  if [ -z $binary ]; then
+    t_InstallPackage curl-minimal
+  fi
 else
   t_InstallPackage curl
 fi
diff --git a/tests/p_openssh/sshd_user_login-with-key.sh b/tests/p_openssh/sshd_user_login-with-key.sh
index f8d41e0..6471e87 100755
--- a/tests/p_openssh/sshd_user_login-with-key.sh
+++ b/tests/p_openssh/sshd_user_login-with-key.sh
@@ -12,7 +12,7 @@ fi
 
 for KeyType in $keytypes; do
 	userdel -rf sshtest; useradd sshtest && echo sshtest | passwd --stdin sshtest
-	runuser -l sshtest -c "echo | ssh-keygen -q -t ${KeyType} -b 1024 -f ~/.ssh/id_${KeyType}" > /dev/null
+	runuser -l sshtest -c "echo | ssh-keygen -q -t ${KeyType} -b 2048 -f ~/.ssh/id_${KeyType}" > /dev/null
 	runuser -l sshtest -c "cat ~/.ssh/*pub > ~/.ssh/authorized_keys && chmod 600 ~/.ssh/*keys" > /dev/null
 	cp ./tests/p_openssh/_helper_sshd_user_login-with-key.expect /home/sshtest/ && chmod +x /home/sshtest/*.expect
 
diff --git a/tests/p_postgresql/1-config-postgresql.sh b/tests/p_postgresql/1-config-postgresql.sh
index 8058422..9de5505 100755
--- a/tests/p_postgresql/1-config-postgresql.sh
+++ b/tests/p_postgresql/1-config-postgresql.sh
@@ -4,7 +4,7 @@
 t_Log "Running $0 - initializing and starting PostgreSQL"
 
 t_Log "Initialize PostgreSQL DB "
-if (t_GetPkgRel postgresql | grep -q el8) then
+if [ $centos_ver -ge 8 ] then
    postgresql-setup --initdb
 elif (t_GetPkgRel postgresql | grep -q el7) then
    postgresql-setup initdb