From 98580fe64c10317a61a9232066e2300ebf6179d6 Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Fri, 5 Dec 2008 22:19:48 +0100
Subject: abstracted some UI stuff

---
 src/core/libs/lib-ui-interactive.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
index c6f2e8d..d5d37c8 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -316,8 +316,8 @@ interactive_filesystem ()
 		then
 			default=
 			[ -n "$fs_mount" ] && default="$fs_mount"
-			_dia_DIALOG --inputbox "Enter the mountpoint for $part" 8 65 "$default" 2>$ANSWER || return 1
-			fs_mount=$(cat $ANSWER)
+			ask_string "Enter the mountpoint for $part" "$default" || return 1
+			fs_mount=$ANSWER_STRING
 		fi
 
 		# ask label, if relevant
@@ -325,8 +325,8 @@ interactive_filesystem ()
 		then
 			default=
 			[ -n "$fs_label" ] && default="$fs_label"
-			_dia_DIALOG --inputbox "Enter the label/name for $part" 8 65 "$default" 2>$ANSWER || return 1
-			fs_label=$(cat $ANSWER)
+			ask_string "Enter the label/name for $part" "$default" || return 1
+			fs_label=$ANSWER_STRING
 		fi
 
 		# ask special params, if relevant
@@ -351,16 +351,16 @@ interactive_filesystem ()
 		then
 			[ -z "$fs_params" ] && default='5G'
 			[ -n "$fs_params" ] && default="$fs_params"
-			_dia_DIALOG --inputbox "Enter the size for this $fs_type on $part (suffix K,M,G,T,P,E. default is M)" 8 65 "$default" 2>$ANSWER || return 1
-			fs_params=$(cat $ANSWER)
+			ask_string "Enter the size for this $fs_type on $part (suffix K,M,G,T,P,E. default is M)" "$default" || return 1
+			fs_params=$ANSWER_STRING
 		fi
 
 		# ask opts
 		default=
 		[ -n "$fs_opts" ] && default="$fs_opts"
 		program=`get_filesystem_program $fs_type`
-		_dia_DIALOG --inputbox "Enter any additional opts for $program" 8 65 "$default" 2>$ANSWER || return 1
-		fs_opts=$(cat $ANSWER | sed 's/ /_/g') #TODO: clean up all whitespace (tabs and shit)
+		ask_string "Enter any additional opts for $program" "$default" || return 1
+		fs_opts=$(sed 's/ /_/g' <<< "$ANSWER_STRING") #TODO: clean up all whitespace (tabs and shit)
 
 		[ -z "$fs_type"   ] && fs_type=no_type
 		[ -z "$fs_mount"  ] && fs_mount=no_mount
-- 
cgit v1.2.3-54-g00ecf