Skip to content

Commit

Permalink
Use file checks to determine rm-sync vs sync
Browse files Browse the repository at this point in the history
  • Loading branch information
timower committed Nov 27, 2023
1 parent c816a85 commit b2eaf09
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions package/xochitl/package
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ configure() {

# sync.service interferes with launchers
# we use manual-sync.service instead
if ! is-masked sync.service; then
systemctl mask sync.service 2> /dev/null
if [ -f /usr/bin/sync ] && ! is-masked sync.service; then
systemctl mask sync.service
fi

if ! is-masked rm-sync.service; then
systemctl mask rm-sync.service 2> /dev/null
if [ -f /usr/bin/rm-sync ] && ! is-masked rm-sync.service; then
systemctl mask rm-sync.service
fi

if [ -f /usr/bin/rm-sync ] && ! is-active [email protected]; then
Expand Down Expand Up @@ -102,11 +102,11 @@ preremove() {
postremove() {
systemctl daemon-reload

if is-masked sync.service; then
systemctl unmask sync.service 2> /dev/null
if [ -f /usr/bin/sync ] && is-masked sync.service; then
systemctl unmask sync.service
fi
if is-masked rm-sync.service; then
systemctl unmask rm-sync.service 2> /dev/null
if [ -f /usr/bin/rm-sync ] && is-masked rm-sync.service; then
systemctl unmask rm-sync.service
fi

if is-enabled xochitl.service && is-enabled launcher.service; then
Expand Down

0 comments on commit b2eaf09

Please sign in to comment.