From b0f8f9b4e34eed16c877a93e1a9509a006faf41a Mon Sep 17 00:00:00 2001
From: Aaron Murray <plugins@omv-extras.org>
Date: Fri, 12 Jan 2024 11:42:59 -0600
Subject: [PATCH] run divert if file exists and has bin/sh in it

Signed-off-by: Aaron Murray <plugins@omv-extras.org>
---
 fix6to7upgrade | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/fix6to7upgrade b/fix6to7upgrade
index 0b22db9..e255fb4 100755
--- a/fix6to7upgrade
+++ b/fix6to7upgrade
@@ -2,7 +2,7 @@
 #
 # shellcheck disable=SC1090,SC1091,SC1117,SC2016,SC2046,SC2086
 #
-# version: 0.0.5
+# version: 0.0.6
 #
 
 if [[ $(id -u) -ne 0 ]]; then
@@ -69,10 +69,16 @@ apt-get --yes \
         --option DPkg::Options::="--force-confold" \
         dist-upgrade
 
+
 if [ ! -f "/usr/sbin/omv-mkaptidx" ]; then
   echo "omv-mkaptidx does not exist.  Downloading..."
   wget -O /usr/sbin/omv-mkaptidx https://github.com/openmediavault/openmediavault/raw/master/deb/openmediavault/usr/sbin/omv-mkaptidx
   chmod +x /usr/sbin/omv-mkaptidx
+else
+  if ! grep -q 'bin/sh' /usr/sbin/omv-mkaptidx; then
+    rm -f /usr/sbin/omv-mkaptidx
+    dpkg-divert --remove --rename /usr/sbin/omv-mkaptidx
+  fi
 fi
 
 echo "Rebuild apt index ..."