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

Fix codename precedence on Mint

Browse Source
This commit is contained in:
Bryan Roessler
2026-02-02 12:12:47 -05:00
parent 9b9af30306
commit 3eb19ea96b
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
installJRMC
View File

@@ -387,7 +387,7 @@ init() {
# Set default targets # Set default targets
BUILD_TARGET="${BUILD_TARGET:-$ID}" BUILD_TARGET="${BUILD_TARGET:-$ID}"
CREATEREPO_TARGET="${CREATEREPO_TARGET:-$ID}" CREATEREPO_TARGET="${CREATEREPO_TARGET:-$ID}"
MC_REPO="${MC_REPO_USER:-${VERSION_CODENAME:-${UBUNTU_CODENAME:-$MC_REPO_HARDCODE}}}" # user>host>hardcoded MC_REPO="${MC_REPO_USER:-${UBUNTU_CODENAME:-${VERSION_CODENAME:-$MC_REPO_HARDCODE}}}" # user>host>hardcoded
echo "MC source -> target: $MC_REPO $MC_ARCH -> $BUILD_TARGET $ARCH" echo "MC source -> target: $MC_REPO $MC_ARCH -> $BUILD_TARGET $ARCH"
set_mc_version set_mc_version
@@ -1595,16 +1595,6 @@ uninstall() {
done done
done done
# Remove the repository files
for file in "/etc/yum.repos.d/jriver.repo" /etc/apt/sources.list.d/{jriver,mediacenter}*.{list,sources}; do
if [[ -e $file ]]; then
echo "Removing repository file: $file"
execute sudo rm -f "$file"
fi
done
[[ $ID == "suse" ]] && execute sudo zypper --non-interactive removerepo jriver
echo "Removing firewall rules" echo "Removing firewall rules"
for service in jriver-mediacenter jriver-xvnc jriver-x11vnc; do for service in jriver-mediacenter jriver-xvnc jriver-x11vnc; do
if command -v firewall-cmd &>/dev/null; then if command -v firewall-cmd &>/dev/null; then
@@ -1627,6 +1617,16 @@ uninstall() {
err "Could not remove Media Center package" err "Could not remove Media Center package"
fi fi
# Remove the repository files
for file in "/etc/yum.repos.d/jriver.repo" /etc/apt/sources.list.d/{jriver,mediacenter}*.{list,sources}; do
if [[ -e $file ]]; then
echo "Removing repository file: $file"
execute sudo rm -f "$file"
fi
done
[[ $ID == "suse" ]] && execute sudo zypper --non-interactive removerepo jriver
local keyfile="/usr/share/keyrings/jriver-com-archive-keyring.gpg" local keyfile="/usr/share/keyrings/jriver-com-archive-keyring.gpg"
if [[ -f $keyfile ]]; then if [[ -f $keyfile ]]; then
echo "Removing the JRiver Media Center GPG key" echo "Removing the JRiver Media Center GPG key"