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

Remove legacy MC_STUB (now handled by package)

Browse Source
This commit is contained in:
Bryan Roessler
2024-08-22 16:51:31 -04:00
parent 9f12abd905
commit b0d6d07a9a
1 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
installJRMC
View File

@@ -415,7 +415,7 @@ setMCVersion() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
declare -g MC_VERSION_SOURCE MC_MVERSION MC_ROOT declare -g MC_VERSION_SOURCE MC_MVERSION MC_ROOT
declare -g MC_PKG MC_RPM MC_STUB MC_STUB_TARGET declare -g MC_PKG MC_RPM
declare cnt declare cnt
# User input # User input
@@ -466,8 +466,6 @@ setMCVersion() {
MC_PKG="mediacenter$MC_MVERSION" MC_PKG="mediacenter$MC_MVERSION"
MC_RPM="$OUTPUTDIR/RPMS/x86_64/mediacenter$MC_MVERSION-$MC_VERSION.x86_64.rpm" MC_RPM="$OUTPUTDIR/RPMS/x86_64/mediacenter$MC_MVERSION-$MC_VERSION.x86_64.rpm"
MC_ROOT="/usr/lib/jriver/Media Center $MC_MVERSION" MC_ROOT="/usr/lib/jriver/Media Center $MC_MVERSION"
MC_STUB="$MC_ROOT/mc$MC_MVERSION"
MC_STUB_TARGET="/usr/bin/mc$MC_MVERSION"
if [[ $MC_VERSION_SOURCE == "user input" ]]; then if [[ $MC_VERSION_SOURCE == "user input" ]]; then
# Append explicit package version when user provides --mcversion # Append explicit package version when user provides --mcversion
@@ -1071,21 +1069,6 @@ runCreaterepo() {
} }
#######################################
# Symlink MC stub
#######################################
symlinkStub() {
debug "Running: ${FUNCNAME[0]}"
if [[ -f $MC_STUB && ! -e $MC_STUB_TARGET ]]; then
if ! execute sudo ln -fs "$MC_STUB" "$MC_STUB_TARGET"; then
err "Symlinking $MC_STUB to $MC_STUB_TARGET failed"
return 1
fi
fi
}
####################################### #######################################
# Symlink certificates if they do not exist in default location # Symlink certificates if they do not exist in default location
####################################### #######################################
@@ -1344,7 +1327,7 @@ service_jriver-mediacenter() {
Environment=DISPLAY=$THIS_DISPLAY Environment=DISPLAY=$THIS_DISPLAY
ExecStart=/usr/bin/mediacenter$MC_MVERSION $* ExecStart=/usr/bin/mediacenter$MC_MVERSION $*
KillMode=none KillMode=none
ExecStop=$MC_STUB_TARGET /MCC 20007 ExecStop=/usr/bin/mc$MC_MVERSION /MCC 20007
Restart=always Restart=always
RestartSec=10 RestartSec=10
TimeoutStopSec=30 TimeoutStopSec=30
@@ -1749,10 +1732,6 @@ uninstall() {
mv "$SCRIPTDIR/.uninstall" "$SCRIPTDIR/.uninstall.bk" mv "$SCRIPTDIR/.uninstall" "$SCRIPTDIR/.uninstall.bk"
fi fi
if [[ -e $MC_STUB_TARGET ]]; then
echo "Removing $MC_STUB_TARGET"
execute sudo rm -f "$MC_STUB_TARGET"
fi
return 0 return 0
} }