From 081052708813ff6b7fc6d492eff91f67f49c78bd Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Tue, 4 Nov 2008 00:02:12 +0100
Subject: beautified the code a bit more

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

diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
index 13859ea..2b2859a 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -391,11 +391,7 @@ interactive_select_packages() {
 
     # set up our install location if necessary and sync up
     # so we can get package lists
-    target_prepare_pacman
-    if [ $? -ne 0 ]; then
-        notify "Pacman preparation failed! Check $LOG for errors."
-        return 1
-    fi
+    target_prepare_pacman || ( notify "Pacman preparation failed! Check $LOG for errors." && return 1 )
 
     # show group listing for group selection
     local _catlist="base ^ ON"
@@ -644,17 +640,13 @@ interactive_select_source()
         var_SYNC_URL=
         var_MIRRORLIST="/etc/pacman.d/mirrorlist"
 
-    _dia_DIALOG --menu "Please select an installation source" 10 35 3 \
+	ask_option no "Please select an installation source" \
     "1" "CD-ROM or OTHER SOURCE" \
-    "2" "FTP/HTTP" 2>$ANSWER
-
-    case $(cat $ANSWER) in
-        "1")
-            var_PKG_SOURCE_TYPE="cd"
-            ;;
-        "2")  
-            var_PKG_SOURCE_TYPE="ftp"
-            ;;
+    "2" "FTP/HTTP" 
+
+    case $ANSWER_OPTION in
+        "1") var_PKG_SOURCE_TYPE="cd" ;;
+        "2") var_PKG_SOURCE_TYPE="ftp" ;;
     esac
 
     if [ "$var_PKG_SOURCE_TYPE" = "cd" ]; then
-- 
cgit v1.2.3-54-g00ecf