From fa985eae29c18bced8a6d299c2fcdd39d30c1289 Mon Sep 17 00:00:00 2001
From: "R.K.Garcia" <rkgarcia@wisc.edu>
Date: Tue, 9 Feb 2021 17:37:19 +0000
Subject: [PATCH] fix OpenSUSE link creeping into centos8, add more info,
 reorder for results speed

---
 Docker/test-ssl-c7r/go.sh       | 2 +-
 Docker/test-ssl-c7r/ssl-test.sh | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Docker/test-ssl-c7r/go.sh b/Docker/test-ssl-c7r/go.sh
index cc5ba1db..ef4b9053 100755
--- a/Docker/test-ssl-c7r/go.sh
+++ b/Docker/test-ssl-c7r/go.sh
@@ -11,7 +11,7 @@ ssl-test() {
   docker run -it --rm -v$SB3:/opt/ShellB3:ro -v$PWD:/work -w /opt/ShellB3/bin ${img} /work/ssl-test.sh 
 }
 
-for img in centos:7 centos:8 ubuntu:16.04 ubuntu:18.04 ubuntu:20.04 docker.io/opensuse/tumbleweed docker.io/opensuse/leap; do 
+for img in centos:7 centos:8 docker.io/opensuse/tumbleweed docker.io/opensuse/leap ubuntu:16.04 ubuntu:18.04 ubuntu:20.04; do 
 	echo "+++ $img"
 	ssl-test $img; 
 done
diff --git a/Docker/test-ssl-c7r/ssl-test.sh b/Docker/test-ssl-c7r/ssl-test.sh
index 641a77cf..d1b03258 100755
--- a/Docker/test-ssl-c7r/ssl-test.sh
+++ b/Docker/test-ssl-c7r/ssl-test.sh
@@ -4,11 +4,10 @@
 
 if apt update &>/dev/null; then
   apt -y install libssl1.1 ca-certificates &>/dev/null || apt -y install libssl1.0.0 ca-certificates &>/dev/null
-  echo Ubuntu/Debian
-fi
-if test -f /usr/lib64/libcrypto.so.1.1; then
+  echo Ubuntu/Debian requires libssl1.1 and ca-certificates packages
+elif test ! -e /usr/lib64/libcrypt.so.1; then
   ln -s libcrypto.so.1.1 /usr/lib64/libcrypt.so.1 &>/dev/null
-  echo OpenSUSE
+  echo OpenSUSE requires libcrypt.so.1 softlink to /usr/lib64/libcrypto.so.1.1
 fi
 
 ./python3 -c 'from urllib import request as req; txt = req.urlopen("https://www.ssec.wisc.edu").read(); print(len(txt) > 0)'
-- 
GitLab