remove locking mechanism...found a better fix for it

8 files changed, 21 insertions, 41 deletions

diff --git a/libsisyphus.sh b/libsisyphus.sh
index a3801fd..002cb7d 100755
--- a/libsisyphus.sh
+++ b/libsisyphus.sh
@@ -1,9 +1,8 @@
 #!/usr/bin/env bash
 
 # export dialog && abort flags
-export local sisyphusprogress="yad --title "sisyphus" --progress --pulsate --width 400 --center --no-buttons --on-top --sticky --fixed --undecorated --skip-taskbar  --auto-close &"
-export local sisyphustextinfo="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"
+export local sisyphusprogress="yad --title "sisyphus" --progress --pulsate --width 400 --center --no-buttons --no-escape --sticky --fixed --undecorated --skip-taskbar  --auto-close &"
+export local sisyphustextinfo="yad --title "sisyphus" --text-info --width 800 --height 600 --center --no-buttons --on-top --sticky --fixed --skip-taskbar --listen --tail &"
 
 # import user interfaces
 source /usr/lib64/sisyphus/accesoriesui.sh
@@ -33,28 +32,23 @@ 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 signal="button-press-event">epkg search $pkgname|$sisyphustextinfo</action>
-			<action signal="button-release-event">$abortnow</action>
+			<action>epkg search $pkgname|$sisyphustextinfo</action>
 		</button>
 		<button space-expand="true" space-extend="true" tooltip-text="Install package(s)">
 			<input file>/usr/share/sisyphus/appinstall.svg</input>
-			<action signal="button-press-event">epkg autoinstall $pkgname|$sisyphusprogress</action>
-			<action signal="button-release-event">$abortnow</action>
+			<action>epkg autoinstall $pkgname|$sisyphusprogress</action>
 		</button>
 		<button space-expand="true" space-extend="true" tooltip-text="Uninstall package(s)">
 			<input file>/usr/share/sisyphus/appremove.svg</input>
-			<action signal="button-press-event">epkg autoremove $pkgname|$sisyphusprogress</action>
-			<action signal="button-release-event">$abortnow</action>
+			<action>epkg autoremove $pkgname|$sisyphusprogress</action>
 		</button>
 		<button space-expand="true" space-extend="true" tooltip-text="Upgrade system">
 			<input file>/usr/share/sisyphus/appupgrade.svg</input>
-			<action signal="button-press-event">epkg autoupgrade|$sisyphusprogress</action>
-			<action signal="button-release-event">$abortnow</action>
+			<action>epkg autoupgrade|$sisyphusprogress</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 signal="button-press-event">epkg autoclean|$sisyphusprogress</action>
-			<action signal="button-release-event">$abortnow</action>
+			<action>epkg autoclean|$sisyphusprogress</action>
 		</button>
 	</hbox>
 	<hseparator space-expand="true" space-extend="true"></hseparator>
diff --git a/ui/accesoriesui.sh b/ui/accesoriesui.sh
index e105415..502e548 100755
--- a/ui/accesoriesui.sh
+++ b/ui/accesoriesui.sh
@@ -15,13 +15,11 @@ export local accesoriesui='
 	<hbox space-expand="false" space-extend="false">
 		<button space-expand="true" space-extend="true" label-text="install">
 			<label>Install package</label>
-			<action signal="button-press-event">epkg autoinstall $accesories|$sisyphusprogress</action>
-			<action signal="button-release-event">$abortnow</action>
+			<action>epkg autoinstall $accesories|$sisyphusprogress</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="uninstall">
 			<label>Uninstall package</label>
-			<action signal="button-press-event">epkg autoremove $accesories|$sisyphusprogress</action>
-			<action signal="button-release-event">$abortnow</action>
+			<action>epkg autoremove $accesories|$sisyphusprogress</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="home">
 			<label>Back home</label>
diff --git a/ui/gamesui.sh b/ui/gamesui.sh
index f4a5f77..da5b01a 100755
--- a/ui/gamesui.sh
+++ b/ui/gamesui.sh
@@ -27,13 +27,11 @@ export local gamesui='
 	<hbox space-expand="false" space-extend="false">
 		<button space-expand="true" space-extend="true" label-text="install">
 			<label>Install package</label>
-			<action signal="button-press-event">epkg autoinstall $game|$sisyphusprogress</action>
-			<action signal="button-release-event">$abortnow</action>
+			<action>epkg autoinstall $game|$sisyphusprogress</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="uninstall">
 			<label>Uninstall package</label>
-			<action signal="button-press-event">epkg autoremove $game|$sisyphusprogress</action>
-			<action signal="button-release-event">$abortnow</action>
+			<action>epkg autoremove $game|$sisyphusprogress</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="home">
 			<label>Back home</label>
diff --git a/ui/graphicsui.sh b/ui/graphicsui.sh
index e595268..66a27e1 100755
--- a/ui/graphicsui.sh
+++ b/ui/graphicsui.sh
@@ -33,13 +33,11 @@ export local graphicsui='
 	<hbox space-expand="false" space-extend="false">
 		<button space-expand="true" space-extend="true" label-text="install">
 			<label>Install package</label>
-			<action signal="button-press-event">epkg autoinstall $graphics|$sisyphusprogress</action>
-			<action signal="button-release-event">$abortnow</action>
+			<action>epkg autoinstall $graphics|$sisyphusprogress</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="uninstall">
 			<label>Uninstall package</label>
-			<action signal="button-press-event">epkg autoremove $graphics|$sisyphusprogress</action>
-			<action signal="button-release-event">$abortnow</action>
+			<action>epkg autoremove $graphics|$sisyphusprogress</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="home">
 		<label>Back home</label>
diff --git a/ui/internetui.sh b/ui/internetui.sh
index 4c2907b..950f5be 100755
--- a/ui/internetui.sh
+++ b/ui/internetui.sh
@@ -61,13 +61,11 @@ export local internetui='
 	<hbox space-expand="false" space-extend="false">
 		<button space-expand="true" space-extend="true" label-text="install">
 			<label>Install package</label>
-			<action signal="button-press-event">epkg autoinstall $internet|$sisyphusprogress</action>
-			<action signal="button-release-event">$abortnow</action>
+			<action>epkg autoinstall $internet|$sisyphusprogress</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="uninstall">
 			<label>Uninstall package</label>
-			<action signal="button-press-event">epkg autoremove $internet|$sisyphusprogress</action>
-			<action signal="button-release-event">$abortnow</action>
+			<action>epkg autoremove $internet|$sisyphusprogress</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="home">
 		<label>Back home</label>
diff --git a/ui/multimediaui.sh b/ui/multimediaui.sh
index b2ff5ce..c9d9eea 100755
--- a/ui/multimediaui.sh
+++ b/ui/multimediaui.sh
@@ -44,13 +44,11 @@ export local multimediaui='
 	<hbox space-expand="false" space-extend="false">
 		<button space-expand="true" space-extend="true" label-text="install">
 			<label>Install package</label>
-			<action signal="button-press-event">epkg autoinstall $multimedia|$sisyphusprogress</action>
-			<action signal="button-release-event">$abortnow</action>
+			<action>epkg autoinstall $multimedia|$sisyphusprogress</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="uninstall">
 			<label>Uninstall package</label>
-			<action signal="button-press-event">epkg autoremove $multimedia|$sisyphusprogress</action>
-			<action signal="button-release-event">$abortnow</action>
+			<action>epkg autoremove $multimedia|$sisyphusprogress</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="home">
 		<label>Back home</label>
diff --git a/ui/officeui.sh b/ui/officeui.sh
index e9fb62c..9f3410e 100755
--- a/ui/officeui.sh
+++ b/ui/officeui.sh
@@ -20,13 +20,11 @@ export local officeui='
 	<hbox space-expand="false" space-extend="false">
 		<button space-expand="true" space-extend="true" label-text="install">
 			<label>Install package</label>
-			<action signal="button-press-event">epkg autoinstall $office|$sisyphusprogress</action>
-			<action signal="button-release-event">$abortnow</action>
+			<action>epkg autoinstall $office|$sisyphusprogress</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="uninstall">
 			<label>Uninstall package</label>
-			<action signal="button-press-event">epkg autoremove $office|$sisyphusprogress</action>
-			<action signal="button-release-event">$abortnow</action>
+			<action>epkg autoremove $office|$sisyphusprogress</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="home">
 			<label>Back home</label>
diff --git a/ui/systemui.sh b/ui/systemui.sh
index dd88019..0b64eab 100755
--- a/ui/systemui.sh
+++ b/ui/systemui.sh
@@ -15,13 +15,11 @@ export local systemui='
 	<hbox space-expand="false" space-extend="false">
 		<button space-expand="true" space-extend="true" label-text="install">
 			<label>Install package</label>
-			<action signal="button-press-event">epkg autoinstall $system|$sisyphusprogress</action>
-			<action signal="button-release-event">$abortnow</action>
+			<action>epkg autoinstall $system|$sisyphusprogress</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="uninstall">
 			<label>Uninstall package</label>
-			<action signal="button-press-event">epkg autoremove $system|$sisyphusprogress</action>
-			<action signal="button-release-event">$abortnow</action>
+			<action>epkg autoremove $system|$sisyphusprogress</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="home">
 		<label>Back home</label>