2 Commits

Author SHA1 Message Date
bde01d6f66 Boost default MC_VERSION 2024-12-06 13:42:26 -05:00
d9e02e430d Remove legacy systemd services from uninstall() 2024-12-06 13:39:48 -05:00
2 changed files with 8 additions and 14 deletions

View File

@@ -29,7 +29,7 @@ $ installJRMC --help
--compat --compat
Build/install MC without minimum dependency version requirements Build/install MC without minimum dependency version requirements
--mcversion VERSION --mcversion VERSION
Build or install a specific MC version, ex. "33.0.37" or "33" (default: latest) Build or install a specific MC version, ex. "33.0.44" or "33" (default: latest)
--mcrepo REPO --mcrepo REPO
Specify the MC repository, ex. "bullseye", "bookworm", "noble", etc (default: latest official) Specify the MC repository, ex. "bullseye", "bookworm", "noble", etc (default: latest official)
--arch ARCH --arch ARCH
@@ -122,9 +122,9 @@ Multiple services (but not `--service-types`) can be installed at one time using
Install MC from the repository and start/enable `jriver-mediacenter.service` as a user service. Install MC from the repository and start/enable `jriver-mediacenter.service` as a user service.
* `installJRMC --install local --compat --restorefile /path/to/license.mjr --mcversion 33.0.37` * `installJRMC --install local --compat --restorefile /path/to/license.mjr --mcversion 33.0.44`
Build and install an MC 33.0.37 compatibility RPM locally and activate it using the `/path/to/license.mjr` Build and install an MC 33.0.44 compatibility RPM locally and activate it using the `/path/to/license.mjr`
* `installJRMC --createrepo --createrepo-webroot /srv/jriver/repo --createrepo-user www-user` * `installJRMC --createrepo --createrepo-webroot /srv/jriver/repo --createrepo-user www-user`

View File

@@ -21,7 +21,7 @@ shopt -s extglob
declare -g SCRIPT_VERSION="1.4.6-dev" declare -g SCRIPT_VERSION="1.4.6-dev"
declare -g MC_REPO="bullseye" # should match the MC_VERSION declare -g MC_REPO="bullseye" # should match the MC_VERSION
declare -g MC_VERSION="33.0.37" # Do find all replace declare -g MC_VERSION="33.0.44" # Do find all replace
declare -g BOARD_URL="https://yabb.jriver.com/interact/index.php/board,86.0.html" # MC33 declare -g BOARD_URL="https://yabb.jriver.com/interact/index.php/board,86.0.html" # MC33
declare -ig UPDATE_SWITCH=1 # set to 0 to disable automatic self-update declare -ig UPDATE_SWITCH=1 # set to 0 to disable automatic self-update
declare -g SCRIPT_URL="https://git.bryanroessler.com/bryan/installJRMC/raw/master/installJRMC" declare -g SCRIPT_URL="https://git.bryanroessler.com/bryan/installJRMC/raw/master/installJRMC"
@@ -1498,13 +1498,13 @@ disable_btrfs_cow() {
# @description Completely uninstalls MC, services, and firewall rules # @description Completely uninstalls MC, services, and firewall rules
uninstall() { uninstall() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
local service unit f i local service type unit f
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_}"
for i in user system; do for type in user system; do
set_service_vars "$service" "$i"; set_service_vars "$service" "$type";
for unit in "$SERVICE_NAME" "$TIMER_NAME"; do for unit in "$SERVICE_NAME" "$TIMER_NAME"; do
if "${IS_ACTIVE[@]}" "$unit" || if "${IS_ACTIVE[@]}" "$unit" ||
"${IS_ENABLED[@]}" "$unit"; then "${IS_ENABLED[@]}" "$unit"; then
@@ -1512,16 +1512,10 @@ uninstall() {
fi fi
done done
for f in "$SERVICE_FNAME" "$TIMER_FNAME"; do for f in "$SERVICE_FNAME" "$TIMER_FNAME"; do
[[ -f $f ]] && [[ -f $f ]] && execute sudo rm -f "$f"
execute sudo rm -f "$f"
done done
"${RELOAD[@]}" "${RELOAD[@]}"
unset f
done done
for f in /etc/systemd/system/jriver-*; do
execute sudo rm -f "$f"
done
unset f
done done
echo "Removing MC repositories" echo "Removing MC repositories"