medvedych/harbour-batterybuddy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use systemctl-user instead of systemctl --user

Browse source
This commit is contained in:
Matti Viljanen 2021-10-10 22:24:12 +03:00
parent 107ea1fec2
commit 846359a551
No known key found for this signature in database
GPG key ID: CF32A1495158F888
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
rpm/harbour-batterybuddy.spec
View file

@ -73,9 +73,6 @@ desktop-file-install --delete-original \
# << files # << files
%posttrans %posttrans
export SFOSUSER=$(id -un 100000)
export DBUS_USER_ADDRESS=unix:path=/run/user/100000/dbus/user_bus_socket
# Remove old service # Remove old service
systemctl stop %{name}.service systemctl stop %{name}.service
systemctl disable %{name}.service systemctl disable %{name}.service
@ -89,23 +86,19 @@ systemctl start %{name}-oneshot.service
# Install/update background daemon (default user) # Install/update background daemon (default user)
cp %{_datadir}/%{name}/service/%{name}.service %{_userunitdir}/%{name}.service cp %{_datadir}/%{name}/service/%{name}.service %{_userunitdir}/%{name}.service
su $SFOSUSER -c "DBUS_SESSION_BUS_ADDRESS=$DBUS_USER_ADDRESS systemctl --user daemon-reload" systemctl-user daemon-reload
su $SFOSUSER -c "DBUS_SESSION_BUS_ADDRESS=$DBUS_USER_ADDRESS systemctl --user enable %{name}.service" systemctl-user enable %{name}.service
su $SFOSUSER -c "DBUS_SESSION_BUS_ADDRESS=$DBUS_USER_ADDRESS systemctl --user stop %{name}.service" systemctl-user stop %{name}.service
su $SFOSUSER -c "DBUS_SESSION_BUS_ADDRESS=$DBUS_USER_ADDRESS systemctl --user start %{name}.service" systemctl-user start %{name}.service
exit 0 exit 0
%postun %postun
// Run on uninstall, not on upgrade // Run on uninstall, not on upgrade
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
# Figure out the default user name systemctl-user stop %{name}.service"
export SFOSUSER=$(id -un 100000) systemctl-user disable %{name}.service"
export DBUS_USER_ADDRESS=unix:path=/run/user/100000/dbus/user_bus_socket
su $SFOSUSER -c "DBUS_SESSION_BUS_ADDRESS=$DBUS_USER_ADDRESS systemctl --user stop %{name}.service"
su $SFOSUSER -c "DBUS_SESSION_BUS_ADDRESS=$DBUS_USER_ADDRESS systemctl --user disable %{name}.service"
rm %{_userunitdir}/%{name}.service rm %{_userunitdir}/%{name}.service
su $SFOSUSER -c "DBUS_SESSION_BUS_ADDRESS=$DBUS_USER_ADDRESS systemctl --user daemon-reload" systemctl-user daemon-reload"
systemctl stop %{name}-oneshot.service systemctl stop %{name}-oneshot.service
systemctl disable %{name}-oneshot.service systemctl disable %{name}-oneshot.service