From 3a1489e7c91efa1d2cbee87ad4c42745bd95f110 Mon Sep 17 00:00:00 2001
From: Aaron Murray <plugins@omv-extras.org>
Date: Mon, 16 Sep 2019 09:18:31 -0500
Subject: [PATCH] improve detection of omv install

---
 install | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/install b/install
index 1b3ddcd..c0e874f 100644
--- a/install
+++ b/install
@@ -2,6 +2,7 @@
 
 declare -l codename
 declare -l omvCodename
+declare -l omvInstall=""
 declare -i version
 
 omvKey="/etc/apt/trusted.gpg.d/openmediavault-archive-keyring.asc"
@@ -36,7 +37,8 @@ esac
 echo "${omvCodename} :: ${version}"
 
 # install openmediavault if not installed already
-if dpkg -l openmediavault > /dev/null; then
+omvInstall=$(dpkg -l | awk '$2 == "openmediavault" { print $1 }')
+if [[ ! "${omvInstall}" == "ii" ]]; then
   echo "Installing openmediavault required packages..."
   apt-get install --yes --no-install-recommends postfix  
 
@@ -53,11 +55,11 @@ if dpkg -l openmediavault > /dev/null; then
 
   echo "Installing openmediavault..."
   apt-get --yes --auto-remove --show-upgraded \
-	--allow-downgrades --allow-change-held-packages \
-	--no-install-recommends \
-	--option Dpkg::Options::="--force-confdef" \
-	--option DPkg::Options::="--force-confold" \
-	install openmediavault
+    --allow-downgrades --allow-change-held-packages \
+    --no-install-recommends \
+    --option Dpkg::Options::="--force-confdef" \
+    --option DPkg::Options::="--force-confold" \
+    install openmediavault
 
   if [ ${version} -eq 5 ]; then
     omv-confdbadm populate