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

add extra install fixes to omvextras

Browse Source
This commit is contained in:
Aaron Murray 2020-03-02 12:40:32 -06:00
parent 20b1bb04b6
commit 72282d9f18
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
install
View File

@ -21,6 +21,7 @@ fi
declare -l codename declare -l codename
declare -l omvCodename declare -l omvCodename
declare -l omvInstall="" declare -l omvInstall=""
declare -l omvextrasInstall=""
declare -i skipFlash=0 declare -i skipFlash=0
declare -i version declare -i version
@ -191,6 +192,22 @@ if [ -f "${file}" ]; then
if ! dpkg --install ${file}; then if ! dpkg --install ${file}; then
echo "Installing other dependencies ..." echo "Installing other dependencies ..."
apt-get --yes --fix-broken install apt-get --yes --fix-broken install
omvextrasInstall=$(dpkg -l | awk '$2 == "openmediavault-omvextrasorg" { print $1 }')
if [[ ! "${omvextrasInstall}" == "ii" ]]; then
echo "omv-extras failed to install correctly. Trying to fix with ${confCmd} ..."
if ${confCmd} omvextras; then
echo "Trying to fix apt ..."
apt-get --yes --fix-broken install
else
echo "${confCmd} failed and openmediavault-omvextrasorg is in a bad state."
exit 3
fi
fi
omvextrasInstall=$(dpkg -l | awk '$2 == "openmediavault-omvextrasorg" { print $1 }')
if [[ ! "${omvextrasInstall}" == "ii" ]]; then
echo "openmediavault-omvextrasorg package failed to install or is in a bad state."
exit 3
fi
fi fi
echo "Updating repos ..." echo "Updating repos ..."
@ -288,6 +305,7 @@ done
if [[ "${arch}" == "amd64" ]] || [[ "${arch}" == "i386" ]]; then if [[ "${arch}" == "amd64" ]] || [[ "${arch}" == "i386" ]]; then
# skip ionice on x86 boards # skip ionice on x86 boards
echo "Done."
exit 0 exit 0
fi fi