diff --git a/setup.sh b/setup.sh index a45046f..972110e 100755 --- a/setup.sh +++ b/setup.sh @@ -1,10 +1,15 @@ #!/bin/sh +FUSERMOUNT=$(which fusermount) +echo $FUSERMOUNT . ./uninstall.sh echo "Install workdirfs for all users" sudo cp workdirfs.py /usr/local/bin/workdirfs.py sudo cp workdirfs.service /etc/systemd/user/workdirfs.service +echo replace +sudo sed -i -e "s@%FUSERMOUNT%@${FUSERMOUNT}@" /etc/systemd/user/workdirfs.service +echo replaced sudo mkdir -pv /etc/systemd/user/default.target.wants/ sudo ln -sf ../workdirfs.service /etc/systemd/user/default.target.wants/workdirfs.service systemctl --user daemon-reload diff --git a/workdirfs.service b/workdirfs.service index 18a10a4..4979f32 100644 --- a/workdirfs.service +++ b/workdirfs.service @@ -4,5 +4,4 @@ Description=Daily working directory ~/Work [Service] Environment=MOUNTPOINT=Work ExecStart=/usr/bin/python3 -u /usr/local/bin/workdirfs.py -m $MOUNTPOINT -ExecStop=-/usr/bin/fusermount -u ${MOUNTPOINT} -ExecStop=-/bin/fusermount -u ${MOUNTPOINT} +ExecStop=%FUSERMOUNT% -u ${MOUNTPOINT}