From fb2aab414af644a73e0dcca99215fa18f57a503f Mon Sep 17 00:00:00 2001
From: Reto Buerki <reet@codelabs.ch>
Date: Thu, 6 Dec 2012 17:00:15 +0100
Subject: Use red color in die() function

This is the function where red color SHOULD be used.
---
 testing/scripts/function.sh | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'testing/scripts/function.sh')

diff --git a/testing/scripts/function.sh b/testing/scripts/function.sh
index 4ee9b24b8..a04490aec 100755
--- a/testing/scripts/function.sh
+++ b/testing/scripts/function.sh
@@ -41,6 +41,9 @@ execute_chroot()
 }
 
 export TERM=xterm
+RED=$(tput setaf 1)
+GREEN=$(tput setaf 2)
+NORMAL=$(tput op)
 
 function cecho {
     echo -e "\033[1;31m$1\033[0m"
@@ -64,10 +67,6 @@ log_action()
 # $1 - exit status of action
 log_status()
 {
-	RED=$(tput setaf 1)
-	GREEN=$(tput setaf 2)
-	NORMAL=$(tput op)
-
 	tput hpa 0
 	if [ $1 -eq 0 ]; then
 		/bin/echo -ne "[${GREEN} ok ${NORMAL}"
@@ -77,14 +76,11 @@ log_status()
 	echo
 }
 
-#############################################
-# output all args to stderr and exit with
-# return code 1
-#
-
+# exit with given error message
+# $1 - error message
 die() {
-    echo $* 1>&2
-    exit 1
+	echo -e "${RED}$1${NORMAL}"
+	exit 1
 }
 
 #############################################
-- 
cgit v1.2.3