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

Switch back to system services from user services

Browse Source
This commit is contained in:
Bryan Roessler
2020-04-08 11:26:25 -04:00
parent cc85f59c31
commit 2c3f1ee6f1
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
installJRMC
View File

@@ -690,26 +690,28 @@ EOF"
systemctl daemon-reload systemctl daemon-reload
systemctl enable --now "$1" systemctl enable --now "$1"
else else
systemctl --user daemon-reload sudo systemctl daemon-reload
systemctl --user enable --now "$1" sudo systemctl enable --now "$1"
fi fi
} }
_generateServiceVars () { _generateServiceVars () {
unset _service_fname _service_name _timer_fname _timer_name _systemd_user unset _service_fname _service_name _timer_fname _timer_name _user_specifier
if [[ "$_user" == "root" ]]; then if [[ "$_user" == "root" ]]; then
_service_fname="/usr/lib/systemd/system/$1.service" _service_fname="/usr/lib/systemd/system/$1.service"
_timer_fname="/usr/lib/systemd/system/$1.timer" _timer_fname="/usr/lib/systemd/system/$1.timer"
_service_name="$1.service" _service_name="$1.service"
_timer_name="$1.timer" _timer_name="$1.timer"
_user_specifier=""
else else
_service_fname="/usr/lib/systemd/system/$1@.service" _service_fname="/usr/lib/systemd/system/$1@.service"
_timer_fname="/usr/lib/systemd/system/$1@.timer" _timer_fname="/usr/lib/systemd/system/$1@.timer"
_service_name="$1@$_user.service" _service_name="$1@$_user.service"
_timer_name="$1@$_user.timer" _timer_name="$1@$_user.timer"
_user_specifier="User=%I"
fi fi
} }
@@ -724,6 +726,7 @@ Description=JRiver Media Center $_mversion Media Server
After=graphical.target After=graphical.target
[Service] [Service]
$_user_specifier
Type=simple Type=simple
Environment=DISPLAY=$_display Environment=DISPLAY=$_display
ExecStart=/usr/bin/mediacenter$_mversion /MediaServer ExecStart=/usr/bin/mediacenter$_mversion /MediaServer
@@ -758,6 +761,7 @@ Description=x11vnc
After=display-manager.service After=display-manager.service
[Service] [Service]
$_user_specifier
Type=forking Type=forking
Environment=DISPLAY=$_display Environment=DISPLAY=$_display
ExecStart=$_exec_start_cmd ExecStart=$_exec_start_cmd
@@ -780,6 +784,7 @@ EOF"
Description=Builds JRiver Media Center RPM file, moves it to the repo dir, and runs createrepo Description=Builds JRiver Media Center RPM file, moves it to the repo dir, and runs createrepo
[Service] [Service]
$_user_specifier
ExecStart=$_basedir/installJRMC --buildpath=$_outputdir --createrepo --createrepo-webroot $_createrepo_webroot --createrepo-user $_createrepo_user ExecStart=$_basedir/installJRMC --buildpath=$_outputdir --createrepo --createrepo-webroot $_createrepo_webroot --createrepo-user $_createrepo_user
[Install] [Install]