From 9a16f09a065514c59c7da57f87d7d5567a93be85 Mon Sep 17 00:00:00 2001
From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Wed, 24 Jun 2015 15:08:21 +0900
Subject: [PATCH] prerun: cleaned-up messages

Change-Id: I7f814ae874cbd8a60a432febf851007d083a91b8
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
(cherry picked from commit e252eb0c37036e7eab70062496207ca3c4fa8136)
---
 .../etc/emulator/prerun.d/generate-emulator-env.sh     |  5 ++++-
 .../prerun.d/{model-config.sh => set-model-config.sh}  | 10 +++-------
 packaging/system-plugin-emulator.spec                  |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)
 rename filesystem/etc/emulator/prerun.d/{model-config.sh => set-model-config.sh} (85%)

diff --git a/filesystem/etc/emulator/prerun.d/generate-emulator-env.sh b/filesystem/etc/emulator/prerun.d/generate-emulator-env.sh
index 519f81f..3350267 100644
--- a/filesystem/etc/emulator/prerun.d/generate-emulator-env.sh
+++ b/filesystem/etc/emulator/prerun.d/generate-emulator-env.sh
@@ -8,7 +8,7 @@ CMDLINE=/proc/cmdline
 EMULATOR_ENV=$(readlink -f $NEW_ROOT/etc/profile.d/emulator_env.sh)
 
 ##### network proxy environments
-echo -e "[${_G} network proxy setting ${C_}]"
+echo -e "*** Generating network proxy env"
 
 if [ -f $EMULATOR_ENV ]; then
     rm -f $EMULATOR_ENV
@@ -33,9 +33,12 @@ do
         __PROXY=`sed "s/^.*${PROXY}=\([^, ]*\).*$/\1/g" $CMDLINE`
         if [ "x${__PROXY}" = "x" ] || ! grep -q ${PROXY} $CMDLINE ; then
             echo "export ${PROXY}=" >> $EMULATOR_ENV
+            echo -e "- ${PROXY}="
         else
             echo "export ${PROXY}=${URL}://${__PROXY}/" >> $EMULATOR_ENV
+            echo -e "- ${PROXY}=${URL}://${__PROXY}/"
         fi
     fi
 done
 echo "export no_proxy=localhost,127.0.0.1/8,10.0.0.0/1" >> $EMULATOR_ENV
+echo -e "- no_proxy=localhost,127.0.0.1/8,10.0.0.0/1"
diff --git a/filesystem/etc/emulator/prerun.d/model-config.sh b/filesystem/etc/emulator/prerun.d/set-model-config.sh
similarity index 85%
rename from filesystem/etc/emulator/prerun.d/model-config.sh
rename to filesystem/etc/emulator/prerun.d/set-model-config.sh
index 5235d3c..638259a 100644
--- a/filesystem/etc/emulator/prerun.d/model-config.sh
+++ b/filesystem/etc/emulator/prerun.d/set-model-config.sh
@@ -8,12 +8,10 @@ fi
 CMDLINE=/proc/cmdline
 XML=$(readlink -f $NEW_ROOT/etc/config/model-config.xml)
 
-echo -e "[${_G} model config setting ${C_}]"
+echo -e "*** Setting model-config.xml"
 
 # display resolution
 if grep -q "video=" $CMDLINE ; then
-        echo -e "[${_G} modify the resolution value of platform features: ${C_}]"
-
         VIDEO=`sed s/.*video=// $CMDLINE | cut -d ' ' -f1`
         FORMAT=`echo $VIDEO | cut -d ':' -f2 | cut -d ',' -f2`
         RESOLUTION=`echo $FORMAT | cut -d '-' -f1`
@@ -28,7 +26,7 @@ if grep -q "video=" $CMDLINE ; then
             sed -i s/"$WIDTH_KEY".*\</"$WIDTH_KEY"\>"$WIDTH"\</ $XML
             HEIGHT_KEY="tizen.org\/feature\/screen.height\" type=\"int\""
             sed -i s/"$HEIGHT_KEY".*\</"$HEIGHT_KEY"\>"$HEIGHT"\</ $XML
-            echo -e "[${_G} width=$WIDTH, height=$HEIGHT ${C_}]"
+            echo -e "- width=$WIDTH, height=$HEIGHT"
 
             # screen size
             SCREENSIZE_KEY="tizen.org\/feature\/screen.size"
@@ -43,8 +41,6 @@ fi
 
 # dot per inch
 if grep -q "dpi=" $CMDLINE ; then
-        echo -e "[${_G} modify the dpi value of platform features: ${C_}]"
-
         DPI=`sed s/.*dpi=// $CMDLINE | cut -d ' ' -f1`
 
         TR_NUM=`echo $DPI | tr -d '[0-9]'`
@@ -55,7 +51,7 @@ if grep -q "dpi=" $CMDLINE ; then
 
             DPI_KEY="tizen.org\/feature\/screen.dpi\" type=\"int\""
             sed -i s/"$DPI_KEY".*\</"$DPI_KEY"\>"$SCREEN_DPI"\</ $XML
-            echo -e "[${_G} dpi=$SCREEN_DPI ${C_}]"
+            echo -e "- dpi=$SCREEN_DPI"
         fi
 fi
 
diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec
index af1135c..6c7bf9f 100644
--- a/packaging/system-plugin-emulator.spec
+++ b/packaging/system-plugin-emulator.spec
@@ -45,7 +45,7 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}
 
 %files
 /etc/emulator/prerun
-/etc/emulator/prerun.d/model-config.sh
+/etc/emulator/prerun.d/set-model-config.sh
 /etc/emulator/prerun.d/generate-emulator-env.sh
 /etc/inittab
 /etc/preconf.d/emulator_ns.preinit
-- 
2.34.1