fixup! fixup! fixup! fixup! fixup! wip: add support for xx-dnf

Author: panekj

src/Dockerfile

@@ -42,16 +42,31 @@ FROM ${TEST_BASE_IMAGE} AS test-base-rhel
 RUN --mount=type=cache,target=/pkg-cache <<EOT
 set -ex
 
-rm -rf /var/cache/dnf
-ln -s /pkg-cache /var/cache/dnf
-echo 'keepcache=True' >> /etc/dnf/dnf.conf
+if test -e /etc/os-release; then
+  . /etc/os-release
+fi
+
+if test -d /var/cache/yum; then
+  rm -rf /var/cache/yum
+  ln -s /pkg-cache /var/cache/yum
+fi
+
+if test -d /var/cache/dnf; then
+  rm -rf /var/cache/dnf
+  ln -s /pkg-cache /var/cache/dnf
+fi
+
+case "${ID}" in
+  centos)
+    sed 's/keepcache=0/keepcache=1/g' /etc/yum.conf
+    ;;
+  *)
+    echo 'keepcache=True' >> /etc/dnf/dnf.conf
+    ;;
+esac
 
 cmd_exists() {
-  if command -v $1 >/dev/null 2>/dev/null; then
-    return 0
-  else
-    return 1
-  fi
+  command -v $1 >/dev/null 2>/dev/null
 }
 
 get_dnf() {

src/test_helper.bash

@@ -37,7 +37,6 @@ pkg() {
       else
         ${xx}apk ${alpine_op} "$@" 2>/dev/null || true
       fi
-      return
       ;;
     debian*)
       if [ "${op}" = "install" ]; then

src/xx-apk

@@ -3,7 +3,7 @@
 set -e
 
 # shellcheck source=./xx-common
-. "$(dirname -- $0)/xx-common"
+. "$(command -v xx-common)"
 
 flock_setup
 if [ -z "$XX_APK_NOLOCK" ]; then

src/xx-apt

@@ -3,7 +3,7 @@
 set -e
 
 # shellcheck source=./xx-common
-. "$(dirname -- $0)/xx-common"
+. "$(command -v xx-common)"
 
 flock_setup
 if [ -z "$XX_APT_NOLOCK" ]; then

src/xx-cargo

@@ -10,7 +10,7 @@ execSilent() {
 }
 
 # shellcheck source=./xx-common
-. "$(dirname -- $0)/xx-common"
+. "$(command -v xx-common)"
 
 flock_setup
 if [ -z "$XX_CARGO_NOLOCK" ]; then

src/xx-cc

@@ -304,7 +304,7 @@ fi
 
 setup() {
   # shellcheck source=./xx-common
-  . "$(dirname -- $0)/xx-common"
+  . "$(command -v xx-common)"
 
   flock_setup
   if [ -z "$XX_CC_NOLOCK" ]; then

src/xx-dnf

@@ -3,7 +3,7 @@
 set -e
 
 # shellcheck source=./xx-common
-. "$(dirname -- $0)/xx-common"
+. "$(command -v xx-common)"
 
 flock_setup
 if [ -z "$XX_DNF_NOLOCK" ]; then

src/xx-verify

@@ -3,7 +3,7 @@
 set -e
 
 # shellcheck source=./xx-common
-. "$(dirname -- $0)/xx-common"
+. "$(command -v xx-common)"
 
 flock_setup
 if [ -z "$XX_VERIFY_NOLOCK" ]; then