summaryrefslogtreecommitdiff
path: root/libsisyphus.sh
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2016-12-26 00:43:04 +0000
committerV3n3RiX <venerix@redcorelinux.org>2016-12-26 00:43:04 +0000
commitab728fad1ecbb54a58f219ec3ae54bd7e8161388 (patch)
treee926e9a1c4e214a1b03fe56ecba8d2b2c1288db2 /libsisyphus.sh
parente17bac7ebcdb7911e76c64f5849c41d38d2e0dc5 (diff)
remove locking mechanism...found a better fix for it
Diffstat (limited to 'libsisyphus.sh')
-rwxr-xr-xlibsisyphus.sh20
1 files changed, 7 insertions, 13 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>