mirror of
https://github.com/narrrl/proton-drive-linux.git
synced 2026-11-03 16:41:26 +01:00
fix(packaging): stop the service before the package is removed
Removing the package left the user service running from the deleted binary, with ~/ProtonDrive still mounted. A user who then deleted the folder to clean up had every file in it moved to the Proton Drive trash, as any delete through the mount is. The .deb (prerm on remove), the .rpm (%preun on erase) and the Arch packages (pre_remove) now stop proton-drive.service for every user with a running user manager, through runuser with that user's XDG_RUNTIME_DIR, so no systemd-machined is needed. Upgrades are left alone. Queued writes stay in the state directory for a later install. The pacman install script lives once in packaging/ and the AUR directories link it; push.sh copies its content into each AUR repository. The uninstall guide now warns not to delete the mount point while the service runs. Reported on Reddit by a user who restored the files from the trash.
This commit is contained in:
1 parent
ee76f4ac60
commit
e0442c56b9
21 files changed
+99
-5
No files matched your search
@@ -92,6 +92,25 @@ install -D -m0644 %{git_dir}/packaging/proton-drive.service \
|
||||
%{buildroot}/usr/lib/systemd/user/proton-drive.service
|
||||
%{git_dir}/po/build.sh %{buildroot}%{_datadir}/locale
|
||||
|
||||
# Removing the package does not stop a running daemon: it keeps serving the
|
||||
# mount from the deleted binary, so files deleted under the mount afterwards,
|
||||
# `rm -rf ~/ProtonDrive` included, are still deleted on Proton Drive. Stop every
|
||||
# logged-in user's service first; anything still queued stays on disk for the
|
||||
# next install. $1 is 0 on an erase and 1 on an upgrade. Same loop as
|
||||
# packaging/proton-drive.install.
|
||||
%preun
|
||||
if [ "$1" -eq 0 ]; then
|
||||
for dir in /run/user/*; do
|
||||
user=$(id -nu "${dir##*/}" 2>/dev/null) || continue
|
||||
if runuser -u "$user" -- env XDG_RUNTIME_DIR="$dir" \
|
||||
systemctl --user --quiet is-active proton-drive.service 2>/dev/null; then
|
||||
echo "Stopping Proton Drive for $user, which unmounts its drive."
|
||||
runuser -u "$user" -- env XDG_RUNTIME_DIR="$dir" \
|
||||
systemctl --user stop proton-drive.service 2>/dev/null || :
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%{_bindir}/pdfs
|
||||
|
||||
Reference in new issue
Block a user