Also uninstall installJRMC output

This commit is contained in:
2025-06-02 15:56:27 -04:00
parent 36548581d3
commit cc7c1d4c5f

View File

@@ -382,7 +382,7 @@ init() {
fi fi
MC_REPO="${USER_MC_REPO:-$MC_REPO}" # allow user override MC_REPO="${USER_MC_REPO:-$MC_REPO}" # allow user override
echo "MC target: $MC_REPO $MC_ARCH -> $BUILD_TARGET $ARCH" echo "MC source -> target: $MC_REPO $MC_ARCH -> $BUILD_TARGET $ARCH"
# Retrieves the latest MC version number if we need it # Retrieves the latest MC version number if we need it
if ((BUILD_SWITCH || LOCAL_INSTALL_SWITCH || CREATEREPO_SWITCH)); then if ((BUILD_SWITCH || LOCAL_INSTALL_SWITCH || CREATEREPO_SWITCH)); then
@@ -1573,6 +1573,11 @@ uninstall() {
debug "${FUNCNAME[0]}()" debug "${FUNCNAME[0]}()"
local service type unit f local service type unit f
if ! ask_ok "Do you really want to uninstall JRiver Media Center?"; then
echo "Uninstall cancelled"
return 1
fi
echo "Stopping and removing all Media Center services" echo "Stopping and removing all Media Center services"
for service in $(compgen -A "function" "service"); do for service in $(compgen -A "function" "service"); do
service="${service##service_}" service="${service##service_}"
@@ -1591,13 +1596,12 @@ uninstall() {
done done
done done
echo "Removing MC repositories" echo "Removing MC repository files"
execute sudo rm -rf \ execute sudo rm -f \
"/etc/yum.repos.d/jriver.repo" \ "/etc/yum.repos.d/jriver.repo" \
/etc/apt/sources.list.d/{jriver,mediacenter}*.{list,sources} # also remove legacy repo files /etc/apt/sources.list.d/{jriver,mediacenter}*.{list,sources} # also remove legacy repo files
[[ $ID == "suse" ]] && [[ $ID == "suse" ]] && execute sudo zypper --non-interactive removerepo jriver
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
@@ -1612,18 +1616,20 @@ uninstall() {
fi fi
done done
echo "Uninstalling JRiver Media Center package" echo "Uninstalling the JRiver Media Center package"
if "${PKG_REMOVE[@]}" "${MC_PKG%%=*}"; then # remove version specifier if "${PKG_REMOVE[@]}" "${MC_PKG%%=*}"; then # remove version specifier
echo "JRiver Media Center has been completely uninstalled" echo "Successfully uninstalled JRiver Media Center ${MC_PKG%%=*}"
elif [[ $? -eq 100 ]]; then elif [[ $? -eq 100 ]]; then
err "JRiver Media Center package '${MC_PKG%%=*}' is not present and was not uninstalled" err "JRiver Media Center package '${MC_PKG%%=*}' is not present and was not uninstalled"
else else
err "Could not remove Media Center package" err "Could not remove Media Center package"
fi fi
echo "Uninstalling JRiver Media Center GPG key"
local keyfile="/usr/share/keyrings/jriver-com-archive-keyring.gpg" local keyfile="/usr/share/keyrings/jriver-com-archive-keyring.gpg"
[[ -f $keyfile ]] && execute sudo rm -f "$keyfile" if [[ -f $keyfile ]]; then
echo "Removing the JRiver Media Center GPG key"
execute sudo rm -f "$keyfile"
fi
if [[ -f $SCRIPT_DIR/.uninstall ]]; then if [[ -f $SCRIPT_DIR/.uninstall ]]; then
echo "Removing files from .uninstall log" echo "Removing files from .uninstall log"
@@ -1633,7 +1639,13 @@ uninstall() {
mv "$SCRIPT_DIR/.uninstall" "$SCRIPT_DIR/.uninstall.bk" mv "$SCRIPT_DIR/.uninstall" "$SCRIPT_DIR/.uninstall.bk"
fi fi
echo "To remove installJRMC output: rm -rf $OUTPUT_DIR" if [[ -d $OUTPUT_DIR ]]; then
if ask_ok "Remove installJRMC output directory $OUTPUT_DIR?"; then
execute sudo rm -rf "$OUTPUT_DIR"
fi
fi
echo "To reset your MC library: mv $HOME/.jriver $HOME/.jriver.bk"
echo "To remove your MC library: rm -rf $HOME/.jriver" echo "To remove your MC library: rm -rf $HOME/.jriver"
return 0 return 0
} }
@@ -1737,14 +1749,7 @@ main() {
# Parse input, set default/host variables, and MC version # Parse input, set default/host variables, and MC version
init "$@" init "$@"
if ((UNINSTALL_SWITCH)); then ((UNINSTALL_SWITCH)) && uninstall
if ask_ok "Do you really want to uninstall JRiver Media Center?"; then
uninstall
else
echo "Uninstall canceled"
fi
exit
fi
install_external_repos install_external_repos