From de7c6d7d956e7ccbbde584a90ba6e55fb2728287 Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Tue, 9 Dec 2008 17:32:20 +0100
Subject: implementation of LOG_TO_FILE 1/0, dont send log/debug to tty1. in
 some cases use exit instead of stop_installer + 2 small fixes

---
 src/aif.sh              | 25 ++++++++++++++++---------
 src/core/libs/lib-ui.sh | 12 ++++++------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/aif.sh b/src/aif.sh
index ea0e4e7..272bbca 100755
--- a/src/aif.sh
+++ b/src/aif.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
 
-###### Set some default variables or get them from the setup script ######
+###### Set some default variables ######
 TITLE="Arch Linux Installation Framework"
 LOG="/dev/tty7"
 LOGFILE=/home/arch/aif/runtime/aif.log
 
+
 ###### Miscalleaneous functions ######
 
 usage ()
@@ -36,9 +37,8 @@ notify ()
 log ()
 {
 	str="[LOG] `date +"%Y-%m-%d %H:%M:%S"` $@"
-	echo -e "$str"
 	echo -e "$str" > $LOG
-	echo -e "$str" >> $LOGFILE
+	[ "$LOG_TO_FILE" = 1 ] && echo -e "$str" >> $LOGFILE
 }
 
 
@@ -47,9 +47,8 @@ debug ()
 	str="[DEBUG] $@"
 	if [ "$DEBUG" = "1" ]
 	then
-		echo -e "$str"
 		echo -e "$str" > $LOG
-		echo -e "$str" >> $LOGFILE
+		[ "$LOG_TO_FILE" = 1 ] && echo -e "$str" >> $LOGFILE
 	fi
 }
 
@@ -256,6 +255,13 @@ mount -o remount,rw / &>/dev/null
 ### Set configuration values ###
 # note : you're free to use or ignore these in your procedure.  probably you want to use these variables to override defaults in your configure worker
 
+#DEBUG: don't touch it. it can be set in the env
+arg_ui_type=
+LOG_TO_FILE=0
+module=
+procedure=
+
+
 var_OPTS_STRING=":i:dlp:" # you can override this variable in your procedure.
 while getopts $var_OPTS_STRING OPTION
 do
@@ -267,9 +273,10 @@ do
 		;;
 	d)
 		export DEBUG=1
+		LOG_TO_FILE=1
 		;;
 	l)
-		LOG_TO_FILE=1 #TODO: implement using this variable
+		LOG_TO_FILE=1
 		;;
 	p)
 		[ -z "$OPTARG" ] && usage && exit 1
@@ -290,18 +297,18 @@ do
 		;;
 	h)
 		usage
-		stop_installer
+		exit
 		;;
 	?)
 		usage
-		stop_installer 5
+		exit 5
 		;;
 	esac
 
 	process_args $OPTION $OPTARG # you can override this function in your profile to parse additional arguments and/or override the behavior above
 done
 
-[ -z "$procedure" ] && usage && stop_installer 5
+[ -z "$procedure" ] && usage && exit 5
 
 load_module core
 [ "$module" != core -a "$module" != http ] && load_module "$module"
diff --git a/src/core/libs/lib-ui.sh b/src/core/libs/lib-ui.sh
index f056583..6275540 100644
--- a/src/core/libs/lib-ui.sh
+++ b/src/core/libs/lib-ui.sh
@@ -14,7 +14,7 @@ DIA_MENU_TEXT="Use the UP and DOWN arrows to navigate menus.  Use TAB to switch
 # display error message and die
 die_error ()
 {
-	[ -n "$LOGFILE" ] && debug "die_error: ERROR: $@" > $LOGFILE
+	debug "die_error: ERROR: $@"
 	notify "ERROR: $@"
         exit 2
 }
@@ -38,7 +38,7 @@ show_warning ()
         else
                 echo "WARNING: $1"
                 [ "${type}" = msg  ] && echo -e "$2"
-                [ "${type}" = text ] && cat $2 || die_error "Could not cat $2"
+                [ "${type}" = text ] && (cat $2 || die_error "Could not cat $2")
         fi
 
         return 0
@@ -79,10 +79,10 @@ log ()
 	then
 		echo -e "$str" >$LOG
 	else
-		echo -e "$str"
+		echo -e "$str" >$LOG
 	fi
 
-	echo -e "$str" >> $LOGFILE
+	[ "$LOG_TO_FILE" = 1 ] && echo -e "$str" >> $LOGFILE
 }
 
 
@@ -95,9 +95,9 @@ debug ()
 		then
 			echo -e "$str" > $LOG
 		else
-			echo -e "$str"
+			echo -e "$str" > $LOG
 		fi
-		echo -e "$str" >> $LOGFILE
+		[ "$LOG_TO_FILE" = 1 ] && echo -e "$str" >> $LOGFILE
 	fi
 }
 
-- 
cgit v1.2.3-54-g00ecf