Modify OS upgrade script as per review comments

Change-Id: Ifb8fd3e445e108e2bae44bca799ad1df35c0ec6f
(cherry picked from commit 823bb24083f986be82cc5cd570345cdd2542b2dd)

diff --git a/script/migration/stt.sh b/script/migration/stt.sh
index ccf4a343b5bab4f38fe89da70755aeaa695a9403..4be602852c9316ae0fe173267a85cf65b0616d8a 100644 (file)
--- a/script/migration/stt.sh
+++ b/script/migration/stt.sh
@@ -18,50 +18,35 @@ function set_dst_path() {
         chsmack -t $1
         chsmack -a "User::App::Shared" $1
     fi
-
-    if [ ! -e $1/stt ]; then
-        log I "STT Migration set destination path $1/stt"
-        mkdir -p -m 0755 $1/stt
-        chsmack -t $1/stt
-        chsmack -a "User::App::Shared" $1/stt
-    fi
 }
 
 function stt_migration() {
     log I "STT Migration START"
     log I "STT Migration config files"
 
+    local CONF_FILE=stt-config.xml
+
     local SRC_OWNER_PATH=$(get_old_rw_path)/usr/home/owner/share/.voice/
-    log I "SRC_OWNER_PATH : $SRC_OWNER_PATH"
     local SRC_GUEST_PATH=$(get_old_rw_path)/usr/home/guest/share/.voice/
-    log I "SRC_GUEST_PATH : $SRC_GUEST_PATH"
-    local SRC_CONF_FILE=$(get_old_rw_path)/usr/home/owner/share/.voice/stt-config.xml
-    log I "SRC_CONF_FILE : $SRC_CONF_FILE"
 
     local DST_OWNER_PATH=$(get_rw_path)/usr/home/owner/share/.voice/
-    log I "DST_OWNER_PATH : $DST_OWNER_PATH"
     local DST_GUEST_PATH=$(get_rw_path)/usr/home/guest/share/.voice/
-    log I "DST_GUEST_PATH : $DST_GUEST_PATH"
+
+    if [ ! -e $SRC_OWNER_PATH/stt ]; then
+        return
+    fi
 
     set_dst_path $DST_OWNER_PATH
-    log I "DST_OWNER_PATH creation completed"
     set_dst_path $DST_GUEST_PATH
-    log I "DST_GUEST_PATH creation completed"
 
-    if [ -e $SRC_OWNER_PATH/stt ]; then
-        mig_copy $SRC_OWNER_PATH/stt $DST_OWNER_PATH/stt || error_handle "default_data" $LINENO
-        log I "mig_copy $SRC_OWNER_PATH/stt $DST_OWNER_PATH/stt"
-    fi
+    mig_copy $SRC_OWNER_PATH/stt $DST_OWNER_PATH/stt || error_handle "default_data" $LINENO
     if [ -e $SRC_GUEST_PATH/stt ]; then
         mig_copy $SRC_GUEST_PATH/stt $DST_GUEST_PATH/stt || error_handle "default_data" $LINENO
-        log I "mig_copy $SRC_GUEST_PATH/stt $DST_GUEST_PATH/stt"
     fi
-    if [ -e $SRC_CONF_FILE ]; then
-        mig_copy $SRC_CONF_FILE $DST_OWNER_PATH || error_handle "default_data" $LINENO
-        log I "mig_copy $SRC_CONF_FILE $DST_OWNER_PATH "
+    if [ -e $SRC_OWNER_PATH/$CONF_FILE ]; then
+        mig_copy $SRC_OWNER_PATH/$CONF_FILE $DST_OWNER_PATH/$CONF_FILE || error_handle "default_data" $LINENO
     fi
 
-
     log I "STT Migration DONE"
 }