prerun: cleaned-up messages

Change-Id: I7f814ae874cbd8a60a432febf851007d083a91b8
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
(cherry picked from commit e252eb0c37036e7eab70062496207ca3c4fa8136)

diff --git a/filesystem/etc/emulator/prerun.d/generate-emulator-env.sh b/filesystem/etc/emulator/prerun.d/generate-emulator-env.sh
index 519f81fadbb70d769eac51ae6462b698c9b2a741..33502676f9b79f002b64e36aba69c1b837ef1ba2 100644 (file)
--- 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/model-config.sh
deleted file mode 100644 (file)
index 5235d3c..0000000
--- a/filesystem/etc/emulator/prerun.d/model-config.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-if [ ! -z $1 ]; then
-        NEW_ROOT=$1
-else
-        NEW_ROOT=
-fi
-
-
-CMDLINE=/proc/cmdline
-XML=$(readlink -f $NEW_ROOT/etc/config/model-config.xml)
-
-echo -e "[${_G} model config setting ${C_}]"
-
-# 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`
-        WIDTH=`echo $RESOLUTION | cut -d 'x' -f1`
-        HEIGHT=`echo $RESOLUTION | cut -d 'x' -f2`
-
-        TR_NUM=`echo $WIDTH$HEIGHT | tr -d '[0-9]'`
-        if [ "$TR_NUM" != "" ] ; then
-            echo "non-integer argument"
-        else
-            WIDTH_KEY="tizen.org\/feature\/screen.width\" type=\"int\""
-            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_}]"
-
-            # screen size
-            SCREENSIZE_KEY="tizen.org\/feature\/screen.size"
-            SCREENSIZE_KEY_NORMAL=""$SCREENSIZE_KEY".normal"
-            SCREENSIZE_KEY_NORMAL_RESOLUTION=""$SCREENSIZE_KEY_NORMAL"."$WIDTH"."$HEIGHT"\" type=\"bool\""
-
-            sed -i s/"$SCREENSIZE_KEY_NORMAL".[0-9].*"type=\"bool\"".*true/"&!!!"/ $XML
-            sed -i s/true!!!/false/ $XML
-            sed -i s/"$SCREENSIZE_KEY_NORMAL_RESOLUTION".*\</"$SCREENSIZE_KEY_NORMAL_RESOLUTION"\>true\</ $XML
-        fi
-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]'`
-        if [ "$TR_NUM" != "" ] ; then
-            echo "non-integer argument"
-        else
-            SCREEN_DPI=`expr "$DPI" "/" 10`
-
-            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_}]"
-        fi
-fi
-

diff --git a/filesystem/etc/emulator/prerun.d/set-model-config.sh b/filesystem/etc/emulator/prerun.d/set-model-config.sh
new file mode 100644 (file)
index 0000000..638259a
--- /dev/null
+++ b/filesystem/etc/emulator/prerun.d/set-model-config.sh
@@ -0,0 +1,57 @@
+if [ ! -z $1 ]; then
+        NEW_ROOT=$1
+else
+        NEW_ROOT=
+fi
+
+
+CMDLINE=/proc/cmdline
+XML=$(readlink -f $NEW_ROOT/etc/config/model-config.xml)
+
+echo -e "*** Setting model-config.xml"
+
+# display resolution
+if grep -q "video=" $CMDLINE ; then
+        VIDEO=`sed s/.*video=// $CMDLINE | cut -d ' ' -f1`
+        FORMAT=`echo $VIDEO | cut -d ':' -f2 | cut -d ',' -f2`
+        RESOLUTION=`echo $FORMAT | cut -d '-' -f1`
+        WIDTH=`echo $RESOLUTION | cut -d 'x' -f1`
+        HEIGHT=`echo $RESOLUTION | cut -d 'x' -f2`
+
+        TR_NUM=`echo $WIDTH$HEIGHT | tr -d '[0-9]'`
+        if [ "$TR_NUM" != "" ] ; then
+            echo "non-integer argument"
+        else
+            WIDTH_KEY="tizen.org\/feature\/screen.width\" type=\"int\""
+            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 "- width=$WIDTH, height=$HEIGHT"
+
+            # screen size
+            SCREENSIZE_KEY="tizen.org\/feature\/screen.size"
+            SCREENSIZE_KEY_NORMAL=""$SCREENSIZE_KEY".normal"
+            SCREENSIZE_KEY_NORMAL_RESOLUTION=""$SCREENSIZE_KEY_NORMAL"."$WIDTH"."$HEIGHT"\" type=\"bool\""
+
+            sed -i s/"$SCREENSIZE_KEY_NORMAL".[0-9].*"type=\"bool\"".*true/"&!!!"/ $XML
+            sed -i s/true!!!/false/ $XML
+            sed -i s/"$SCREENSIZE_KEY_NORMAL_RESOLUTION".*\</"$SCREENSIZE_KEY_NORMAL_RESOLUTION"\>true\</ $XML
+        fi
+fi
+
+# dot per inch
+if grep -q "dpi=" $CMDLINE ; then
+        DPI=`sed s/.*dpi=// $CMDLINE | cut -d ' ' -f1`
+
+        TR_NUM=`echo $DPI | tr -d '[0-9]'`
+        if [ "$TR_NUM" != "" ] ; then
+            echo "non-integer argument"
+        else
+            SCREEN_DPI=`expr "$DPI" "/" 10`
+
+            DPI_KEY="tizen.org\/feature\/screen.dpi\" type=\"int\""
+            sed -i s/"$DPI_KEY".*\</"$DPI_KEY"\>"$SCREEN_DPI"\</ $XML
+            echo -e "- dpi=$SCREEN_DPI"
+        fi
+fi
+

diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec
index af1135cf8af90330af5c54ed71480dfb52cca61b..6c7bf9f453f74b2164e49133332bec8b8f5a693f 100644 (file)
--- 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