fix(pkg): disable kill switch before uninstalling the package

tprasadtp · Feb 18, 2024 · c47c4d9 · c47c4d9
1 parent f6175e8
commit c47c4d9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/debian/protonwire.preremove b/debian/protonwire.preremove
@@ -5,13 +5,15 @@
 set -e
 case "$1" in
 remove)
-    echo "Stopping unit potonwire"
-    systemctl stop -q potonwire || true
+    echo "Disabling kill switch (if any)"
+    protonwire disable-killswitch || true
+    echo "Stopping unit protonwire"
+    systemctl stop -q protonwire || true
 
     for i in $(seq 100); do
         echo "Waiting until unit $unit is stopped [attempt $i]"
-        if ! systemctl is-active -q potonwire; then
-            echo "potonwire is stopped."
+        if ! systemctl is-active -q protonwire; then
+            echo "protonwire is stopped."
             break
         fi
         sleep 0.5

diff --git a/rpm/protonwire.preremove b/rpm/protonwire.preremove
@@ -4,13 +4,15 @@
 
 set -e
 
+echo "Disabling kill switch (if any)"
+protonwire disable-killswitch || true
 echo "Stopping unit potonwire"
-systemctl stop -q potonwire || true
+systemctl stop -q protonwire || true
 
 for i in $(seq 100); do
     echo "Waiting until unit $unit is stopped [attempt $i]"
-    if ! systemctl is-active -q potonwire; then
-        echo "potonwire is stopped."
+    if ! systemctl is-active -q protonwire; then
+        echo "protonwire is stopped."
         break
     fi
     sleep 0.5