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

tonistiigi · Jun 17, 2024 · 6c51444 · 6c51444
1 parent 8cdadb3
commit 6c51444
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/test_helper.bash b/src/test_helper.bash
@@ -2,20 +2,20 @@
 
 pkg() {
   case "${op}" in
-    add|install)
+    add | install)
       alpine_op="add"
       op="install"
       apt_opts="--no-install-recommends"
-    ;;
-    del|remove)
+      ;;
+    del | remove)
       alpine_op="del"
       op="remove"
       apt_opts="--autoremove"
-    ;;
+      ;;
     *)
       printf "Unknown op"
       exit 1
-    ;;
+      ;;
   esac
 
   case "${xx}" in
@@ -31,32 +31,32 @@ pkg() {
   # - Fedora: ID_LIKE=""        ID="fedora"
   # - Redhat: ID_LIKE="fedora"  ID="rhel"
   case "${ID_LIKE}${ID}" in
-    alpine|chimera|adelie)
+    alpine | chimera | adelie)
       if [ "${op}" = "install" ]; then
         ${xx}apk ${alpine_op} "$@"
       else
         ${xx}apk ${alpine_op} "$@" 2>/dev/null || true
       fi
       return
-    ;;
+      ;;
     debian*)
       if [ "${op}" = "install" ]; then
         xxrun ${xx}apt ${op} -y ${apt_opts} "$@"
       else
         xxrun ${xx}apt ${op} -y ${apt_opts} "$@" 2>/dev/null || true
       fi
-    ;;
+      ;;
     fedora*)
       if [ "${op}" = "install" ]; then
         xxrun ${xx}dnf ${op} -y "$@"
       else
         xxrun ${xx}dnf ${op} -y "$@" 2>/dev/null || true
       fi
-    ;;
+      ;;
     *)
       printf "Unknown OS:\n\t%s\n\t%s" "${ID}" "${ID_LIKE}"
       exit 1
-    ;;
+      ;;
   esac
 }
 

diff --git a/src/xx-common b/src/xx-common
@@ -39,7 +39,7 @@ add_package() {
 }
 
 flock_setup() {
-  if ! test -d /var/run/lock ; then
+  if ! test -d /var/run/lock; then
     mkdir -p /var/run/lock
   fi
 
@@ -48,7 +48,7 @@ flock_setup() {
     case "${ID}" in
       fedora)
         add_package util-linux-core /dev/null
-      ;;
+        ;;
       *) ;;
     esac
   fi