From 6b3099135638121af264e3b37e0232a44585d3d7 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 24 Dec 2016 21:21:56 +0000
Subject: use xterm instead of zenity clone yad. Better control of env
 variables, and we have interactive mode, one can abort an operation at any
 time

---
 accesoriesui.sh |  4 ++--
 gamesui.sh      |  4 ++--
 graphicsui.sh   |  4 ++--
 internetui.sh   |  4 ++--
 libsisyphus.sh  | 15 ++++++++-------
 multimediaui.sh |  4 ++--
 officeui.sh     |  4 ++--
 systemui.sh     |  4 ++--
 8 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/accesoriesui.sh b/accesoriesui.sh
index 5d34689..0139efb 100755
--- a/accesoriesui.sh
+++ b/accesoriesui.sh
@@ -15,11 +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>epkg autoinstall $accesories|$showdialog</action>
+			<action>$showprogress epkg autoinstall $accesories</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="uninstall">
 			<label>Uninstall package</label>
-			<action>epkg autoremove $accesories|$showdialog</action>
+			<action>$showprogress epkg autoremove $accesories</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="home">
 			<label>Back home</label>
diff --git a/gamesui.sh b/gamesui.sh
index f1f3af0..1795ead 100755
--- a/gamesui.sh
+++ b/gamesui.sh
@@ -27,11 +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>epkg autoinstall $game|$showdialog</action>
+			<action>$showprogress epkg autoinstall $game</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="uninstall">
 			<label>Uninstall package</label>
-			<action>epkg autoremove $game|$showdialog</action>
+			<action>$showprogress epkg autoremove $game</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="home">
 			<label>Back home</label>
diff --git a/graphicsui.sh b/graphicsui.sh
index e9a4efa..5c3f243 100755
--- a/graphicsui.sh
+++ b/graphicsui.sh
@@ -15,11 +15,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>epkg autoinstall $graphics|$showdialog</action>
+			<action>$showprogress epkg autoinstall $graphics</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="uninstall">
 			<label>Uninstall package</label>
-			<action>epkg autoremove $graphics|$showdialog</action>
+			<action>$showprogress epkg autoremove $graphics</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="home">
 		<label>Back home</label>
diff --git a/internetui.sh b/internetui.sh
index 69cd7c4..ec409d9 100755
--- a/internetui.sh
+++ b/internetui.sh
@@ -19,11 +19,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>epkg autoinstall $internet|$showdialog</action>
+			<action>$showprogress epkg autoinstall $internet</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="uninstall">
 			<label>Uninstall package</label>
-			<action>epkg autoremove $internet|$showdialog</action>
+			<action>$showprogress epkg autoremove $internet</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="home">
 		<label>Back home</label>
diff --git a/libsisyphus.sh b/libsisyphus.sh
index 38b7bd4..6b38c72 100755
--- a/libsisyphus.sh
+++ b/libsisyphus.sh
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
-# export yad worker variable
-export local showdialog="yad --title "sisyphus" --text-info --width 800 --height 600 --center --no-buttons --on-top --sticky --fixed --skip-taskbar --listen --tail &"
+# export xterm flags
+export local showprogress="xterm -maximized -e"
+export local showresults="xterm -maximized -hold -e"
 
 # import user interfaces
 source /usr/lib64/sisyphus/accesoriesui.sh
@@ -28,23 +29,23 @@ export local mainui='
 	<hbox>
 		<button tooltip-text="Search for package(s)">
 			<label>Search package(s)</label>
-			<action>epkg search $pkgname | $showdialog</action>
+			<action>$showresults epkg search $pkgname</action>
 		</button>
 		<button tooltip-text="Install new package(s) (no confirmation)">
 			<label>Install package(s)</label>
-			<action>epkg autoinstall $pkgname | $showdialog</action>
+			<action>$showprogress epkg autoinstall $pkgname</action>
 		</button>
 		<button tooltip-text="Uninstall package(s) safely (no confirmation)">
 			<label>Remove package(s)</label>
-			<action>epkg autoremove $pkgname | $showdialog</action>
+			<action>$showprogress epkg autoremove $pkgname</action>
 		</button>
 		<button tooltip-text="Upgrade system (no confirmation)">
 			<label>Upgrade System</label>
-			<action>epkg autoupgrade | $showdialog</action>
+			<action>$showprogress epkg autoupgrade</action>
 		</button>
 		<button tooltip-text="Remove orphan packages(s) aka no longer needed (no confirmation)">
 			<label>Remove orphan package(s)</label>
-			<action>epkg autoclean | $showdialog</action>
+			<action>$showprogress epkg autoclean</action>
 		</button>
 	</hbox>
 </frame>
diff --git a/multimediaui.sh b/multimediaui.sh
index dc59493..a1bc4c5 100755
--- a/multimediaui.sh
+++ b/multimediaui.sh
@@ -15,11 +15,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>epkg autoinstall $multimedia|$showdialog</action>
+			<action>$showprogress epkg autoinstall $multimedia</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="uninstall">
 			<label>Uninstall package</label>
-			<action>epkg autoremove $multimedia|$showdialog</action>
+			<action>$showprogress epkg autoremove $multimedia</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="home">
 		<label>Back home</label>
diff --git a/officeui.sh b/officeui.sh
index 03ee543..7e8703d 100755
--- a/officeui.sh
+++ b/officeui.sh
@@ -20,11 +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>epkg autoinstall $office|$showdialog</action>
+			<action>$showprogress epkg autoinstall $office</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="uninstall">
 			<label>Uninstall package</label>
-			<action>epkg autoremove $office|$showdialog</action>
+			<action>$showprogress epkg autoremove $office</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="home">
 			<label>Back home</label>
diff --git a/systemui.sh b/systemui.sh
index 9191eba..9a3e95e 100755
--- a/systemui.sh
+++ b/systemui.sh
@@ -15,11 +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>epkg autoinstall $system|$showdialog</action>
+			<action>$showprogress epkg autoinstall $system</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="uninstall">
 			<label>Uninstall package</label>
-			<action>epkg autoremove $system|$showdialog</action>
+			<action>$showprogress epkg autoremove $system</action>
 		</button>
 		<button space-expand="true" space-extend="true" label-text="home">
 		<label>Back home</label>
-- 
cgit v1.2.3