From 98b662c77b72bd62636c1e87c90f09245129f870 Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Mon, 25 Aug 2003 00:55:41 +0000
Subject: [PATCH] fixed xfree86 stone module and adapt the gui_*
 implementations for this

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1167 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 Documentation/Developers/CHANGELOG-RENE   | 1 +
 package/base/sysfiles/stone_gui_dialog.sh | 2 +-
 package/base/sysfiles/stone_gui_text.sh   | 2 +-
 package/base/sysfiles/stone_gui_x11.sh    | 3 ++-
 package/x11/xfree86/stone_mod_xfree86.sh  | 4 ++--
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index 78b4f2c8d..3ec162b3b 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -2,6 +2,7 @@
 *) 2003-08-24 (2.0.0-rc1 - 2.0.0-rc2)
 
  - bumped version
+ - fixed xfree86 stone module and adapt the gui_* implementations for this
 
 *) 2003-08-23 (2.0.0-camp - 2.0.0-rc1)
 
diff --git a/package/base/sysfiles/stone_gui_dialog.sh b/package/base/sysfiles/stone_gui_dialog.sh
index 8583af3e6..758cff9cf 100644
--- a/package/base/sysfiles/stone_gui_dialog.sh
+++ b/package/base/sysfiles/stone_gui_dialog.sh
@@ -173,6 +173,6 @@ gui_edit() {
 # Use: gui_cmd "Title" "Command"
 # (Title isn't used in this GUI type)
 gui_cmd() {
-	eval "$2"
+	shift ; eval "$@"
 	read -p "Press ENTER to continue."
 }
diff --git a/package/base/sysfiles/stone_gui_text.sh b/package/base/sysfiles/stone_gui_text.sh
index 0def2558e..13a51c1b2 100644
--- a/package/base/sysfiles/stone_gui_text.sh
+++ b/package/base/sysfiles/stone_gui_text.sh
@@ -99,7 +99,7 @@ gui_edit() {
 # Use: gui_cmd "Title" "Command"
 #
 gui_cmd() {                       
-        eval "$2"
+        shift ; eval "$@"
 	read -p "Press ENTER to continue."
 }
 
diff --git a/package/base/sysfiles/stone_gui_x11.sh b/package/base/sysfiles/stone_gui_x11.sh
index 9f264915a..ab2a37f97 100644
--- a/package/base/sysfiles/stone_gui_x11.sh
+++ b/package/base/sysfiles/stone_gui_x11.sh
@@ -40,7 +40,8 @@ gui_edit() {
 }
 
 gui_cmd() {
-	xterm -T "STONE - $1" -n "STONE" -e bash -c "$2
+	title="$1" ; shift
+	xterm -T "STONE - $title" -n "STONE" -e bash -c "$@
 			read -p 'Press ENTER to continue'"
 }
 
diff --git a/package/x11/xfree86/stone_mod_xfree86.sh b/package/x11/xfree86/stone_mod_xfree86.sh
index 558ae8e18..5bfb67802 100644
--- a/package/x11/xfree86/stone_mod_xfree86.sh
+++ b/package/x11/xfree86/stone_mod_xfree86.sh
@@ -36,10 +36,10 @@ main() {
 		cmd="gui_menu xfree86 'XFree86 Configuration Menu'
 
 		'Run xf86cfg (recommended, new interactve config)'
-			'gui_cmd xf86cfg'
+			'gui_cmd xf86ccfg xf86cfg -xf86config /etc/X11/XF86Config'
 
 		'Run X -configure (automated config)'
-			'gui_cmd xfree86 -configure ; mv /root/XF86Config.new /etc/X11/XF86Config.new'
+			'gui_cmd XFree86 XFree86 -configure ; mv /root/XF86Config.new /etc/X11/XF86Config'
 
 		'Run xf86config (old textual config)'
 			'gui_cmd xf86config xf86config'"