improve detection of omv install

This commit is contained in:
Aaron Murray 2019-09-16 09:18:31 -05:00
parent cf90d07454
commit 3a1489e7c9

14
install
View File

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