From 5e761f5d93077b2e43e24b42dc2f2b4327372cbf Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 25 Dec 2016 23:40:07 +0000
Subject: kill any running operation if worker window is closed

---
 libsisyphus.sh | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'libsisyphus.sh')

diff --git a/libsisyphus.sh b/libsisyphus.sh
index 689d12f..b3d7e9b 100755
--- a/libsisyphus.sh
+++ b/libsisyphus.sh
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
-# export dialog flags
+# export dialog && abort flags
 export local showdialog="yad --title "sisyphus" --text-info --width 800 --height 600 --center --no-buttons --on-top --sticky --fixed --skip-taskbar --listen --tail"
+export local abortnow="killall -9 emerge"
 
 # import user interfaces
 source /usr/lib64/sisyphus/accesoriesui.sh
@@ -31,23 +32,28 @@ export local mainui='
 	<hbox space-expand="false" space-extend="false">
 		<button space-expand="true" space-extend="true" tooltip-text="Search package(s)">
 			<input file>/usr/share/sisyphus/appsearch.svg</input>
-			<action>epkg search $pkgname|$showdialog</action>
+			<action signal="button-press-event">epkg search $pkgname|$showdialog</action>
+			<action signal="button-release-event">$abortnow</action>
 		</button>
 		<button space-expand="true" space-extend="true" tooltip-text="Install package(s)">
 			<input file>/usr/share/sisyphus/appinstall.svg</input>
-			<action>epkg autoinstall $pkgname|$showdialog</action>
+			<action signal="button-press-event">epkg autoinstall $pkgname|$showdialog</action>
+			<action signal="button-release-event">$abortnow</action>
 		</button>
 		<button space-expand="true" space-extend="true" tooltip-text="Uninstall package(s)">
 			<input file>/usr/share/sisyphus/appremove.svg</input>
-			<action>epkg autoremove $pkgname|$showdialog</action>
+			<action signal="button-press-event">epkg autoremove $pkgname|$showdialog</action>
+			<action signal="button-release-event">$abortnow</action>
 		</button>
 		<button space-expand="true" space-extend="true" tooltip-text="Upgrade system">
 			<input file>/usr/share/sisyphus/appupgrade.svg</input>
-			<action>epkg autoupgrade|$showdialog</action>
+			<action signal="button-press-event">epkg autoupgrade|$showdialog</action>
+			<action signal="button-release-event">$abortnow</action>
 		</button>
 		<button space-expand="true" space-extend="true" tooltip-text="Remove orphan packages(s) aka no longer needed">
 			<input file>/usr/share/sisyphus/appcleanup.svg</input>
-			<action>epkg autoclean|$showdialog</action>
+			<action signal="button-press-event">epkg autoclean|$showdialog</action>
+			<action signal="button-release-event">$abortnow</action>
 		</button>
 	</hbox>
 	<hseparator space-expand="true" space-extend="true"></hseparator>
-- 
cgit v1.2.3