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

improve omv-mkaptidx fix

Browse Source 
Signed-off-by: Aaron Murray <plugins@omv-extras.org>
This commit is contained in:
Aaron Murray 2024-04-29 11:39:29 -05:00
parent 8fe69dba15
commit 4805aef954
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fix6to7upgrade
View File

@ -2,7 +2,7 @@
# #
# shellcheck disable=SC1090,SC1091,SC1117,SC2016,SC2046,SC2086 # shellcheck disable=SC1090,SC1091,SC1117,SC2016,SC2046,SC2086
# #
# version: 0.0.6 # version: 0.0.7
# #
if [[ $(id -u) -ne 0 ]]; then if [[ $(id -u) -ne 0 ]]; then
@ -57,8 +57,7 @@ if [ -f "${security}" ]; then
fi fi
echo "Running apt-get update ..." echo "Running apt-get update ..."
apt-get update if ! apt-get update; then
if [ $? -gt 0 ]; then
echo "apt-get update failed. Your repos need to be fixed." echo "apt-get update failed. Your repos need to be fixed."
exit 1 exit 1
fi fi
@ -69,16 +68,12 @@ apt-get --yes \
--option DPkg::Options::="--force-confold" \ --option DPkg::Options::="--force-confold" \
dist-upgrade dist-upgrade
mkaptidx_url="https://github.com/openmediavault/openmediavault/raw/master/deb/openmediavault/usr/sbin/omv-mkaptidx"
if [ ! -f "/usr/sbin/omv-mkaptidx" ]; then mkaptidx_path="/usr/sbin/omv-mkaptidx"
echo "omv-mkaptidx does not exist. Downloading..." if [ ! -f "${mkaptidx_path}" ] || ! grep -q 'bin/sh' "${mkaptidx_path}"; then
wget -O /usr/sbin/omv-mkaptidx https://github.com/openmediavault/openmediavault/raw/master/deb/openmediavault/usr/sbin/omv-mkaptidx echo "Downloading omv-mkaptidx..."
chmod +x /usr/sbin/omv-mkaptidx wget --output-document="${mkaptidx_path}" "${mkaptidx_url}"
else chmod +x "${mkaptidx_path}"
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 fi
echo "Rebuild apt index ..." echo "Rebuild apt index ..."