bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Always remove jammy repo

Browse Source
This commit is contained in:
Bryan Roessler
2025-04-24 18:42:55 -04:00
parent 8c97500dd4
commit a98f3cf994
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
installJRMC
View File

@@ -1013,6 +1013,7 @@ install_mc_deb() {
fi fi
# On Ubuntu 24.04+, add jammy repos for libwebkit2gtk-4.0-37 # On Ubuntu 24.04+, add jammy repos for libwebkit2gtk-4.0-37
local -i remove_jammy=0
if [[ "$ID" == "ubuntu" ]]; then if [[ "$ID" == "ubuntu" ]]; then
local major_version="${VERSION_ID%%.*}" local major_version="${VERSION_ID%%.*}"
local minor_version="${VERSION_ID##*.}" local minor_version="${VERSION_ID##*.}"
@@ -1028,24 +1029,25 @@ install_mc_deb() {
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
EOF" EOF"
"${PKG_UPDATE[@]}" || err "Package update failed!" "${PKG_UPDATE[@]}" || err "Package update failed!"
remove_jammy=1
fi fi
fi fi
# Use --reinstall to make sure local package is installed over repo package # Use --reinstall to make sure local package is installed over repo package
if ! install_package \ if ! install_package \
--no-install-check \ --no-install-check \
--no-gpg-check \ --no-gpg-check \
--allow-downgrades \ --allow-downgrades \
--reinstall \ --reinstall \
"$MC_DEB"; then "$MC_DEB"; then
err "Local MC DEB installation failed" err "Local MC DEB installation failed"
((remove_jammy)) && execute rm -f "$repo_file"
if ask_ok "Remove source DEB and retry"; then if ask_ok "Remove source DEB and retry"; then
execute rm -f "$MC_DEB" execute rm -f "$MC_DEB"
exec "$SCRIPT_PATH" "$@" "--no-update" exec "$SCRIPT_PATH" "$@" "--no-update"
else
return 1
fi fi
fi fi
((remove_jammy)) && execute rm -f "$repo_file"
} }
# @description Installs MC via RPM package # @description Installs MC via RPM package