OpenSource/OpenMediaVault_installScript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update for latest omvextras

Browse Source
This commit is contained in:
Aaron Murray 2023-06-04 18:24:49 -05:00
parent 58293fab66
commit 94e6689740
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
install
View File

@ -13,7 +13,7 @@
# https://github.com/armbian/config/blob/master/debian-software # https://github.com/armbian/config/blob/master/debian-software
# https://forum.openmediavault.org/index.php/Thread/25062-Install-OMV5-on-Debian-10-Buster/ # https://forum.openmediavault.org/index.php/Thread/25062-Install-OMV5-on-Debian-10-Buster/
# #
# version: 1.6.30 # version: 1.6.31
# #
if [[ $(id -u) -ne 0 ]]; then if [[ $(id -u) -ne 0 ]]; then
@ -59,6 +59,7 @@ declare -l omvCodename
declare -l omvInstall="" declare -l omvInstall=""
declare -l omvextrasInstall="" declare -l omvextrasInstall=""
aptclean="/usr/sbin/omv-aptclean"
confCmd="omv-salt deploy run" confCmd="omv-salt deploy run"
cpuFreqDef="/etc/default/cpufrequtils" cpuFreqDef="/etc/default/cpufrequtils"
crda="/etc/default/crda" crda="/etc/default/crda"
@ -232,7 +233,7 @@ fi
dpkg -P udisks2 dpkg -P udisks2
echo "Install prerequisites..." echo "Install prerequisites..."
apt-get --yes --no-install-recommends install dirmngr gnupg wget apt-get --yes --no-install-recommends install gnupg wget
if [ -f /etc/armbian-release ]; then if [ -f /etc/armbian-release ]; then
systemctl unmask systemd-networkd.service systemctl unmask systemd-networkd.service
@ -320,12 +321,9 @@ if [ -f "${file}" ]; then
apt-get --yes --fix-broken install apt-get --yes --fix-broken install
omvextrasInstall=$(dpkg -l | awk '$2 == "openmediavault-omvextrasorg" { print $1 }') omvextrasInstall=$(dpkg -l | awk '$2 == "openmediavault-omvextrasorg" { print $1 }')
if [[ ! "${omvextrasInstall}" == "ii" ]]; then if [[ ! "${omvextrasInstall}" == "ii" ]]; then
echo "omv-extras failed to install correctly. Trying to fix with ${confCmd} ..." echo "omv-extras failed to install correctly. Trying to fix apt ..."
if ${confCmd} omvextras; then if ! apt-get --yes --fix-broken install; then
echo "Trying to fix apt ..." echo "Fix failed and openmediavault-omvextrasorg is in a bad state."
apt-get --yes --fix-broken install
else
echo "${confCmd} failed and openmediavault-omvextrasorg is in a bad state."
exit 3 exit 3
fi fi
fi fi
@ -337,7 +335,7 @@ if [ -f "${file}" ]; then
fi fi
echo "Updating repos ..." echo "Updating repos ..."
omv-salt deploy run omvextras ${aptclean} repos
else else
echo "There was a problem downloading the package." echo "There was a problem downloading the package."
fi fi