Modify OS upgrade script as per review comments

Change-Id: Ibb2a1cffd580b397407f3b759d5c1e3247ea1599

diff --git a/script/migration/multi-assistant.sh b/script/migration/multi-assistant.sh
index de3436d4e70dedcf37d7abe135ef653614fa39b9..d1edfd2db8e0f16b200da3fd5b3bc454e6283ffd 100644 (file)
--- a/script/migration/multi-assistant.sh
+++ b/script/migration/multi-assistant.sh
@@ -19,41 +19,38 @@ source "$UPDATE_EXEC_PATH/common/error_handle.inc"
 
 # migration Main function
 function set_dst_path() {
-    if [ ! -e $1 ]; then
-        log I "multi-assistant migration set destination path $1"
-        mkdir -p -m 0755 $1
-        chsmack -t $1
-        chsmack -a "User::App::Shared" $1
+    local DST_PARENT_PATH=$(dirname $1)
+    if [ ! -e $DST_PARENT_PATH ]; then
+        mkdir -p -m 0777 $DST_PARENT_PATH
+        chown "owner:users" $DST_PARENT_PATH
+        chsmack -t $DST_PARENT_PATH
+        chsmack -a "User::App::Shared" $DST_PARENT_PATH
     fi
 }
 
 function multi_assistant_migration() {
-    log I "multi-assistant migration START"
-    log I "multi-assistant migration config files"
+    log I "multi-assistant Migration START"
 
     local SRC_OWNER_PATH=$(get_old_rw_path)/usr/home/owner/share/.multiassistant/
-    log I "SRC_OWNER_PATH : $SRC_OWNER_PATH"
     local SRC_GUEST_PATH=$(get_old_rw_path)/usr/home/guest/share/.multiassistant/
-    log I "SRC_GUEST_PATH : $SRC_GUEST_PATH"
+
+    if [ ! -e $SRC_OWNER_PATH ]; then
+        return
+    fi
+    if [ ! -e $SRC_GUEST_PATH ]; then
+        return
+    fi
 
     local DST_OWNER_PATH=$(get_rw_path)/usr/home/owner/share/.multiassistant/
-    log I "DST_OWNER_PATH : $DST_OWNER_PATH"
     local DST_GUEST_PATH=$(get_rw_path)/usr/home/guest/share/.multiassistant/
-    log I "DST_GUEST_PATH : $DST_GUEST_PATH"
 
     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 ]; then
-        mig_copy $SRC_OWNER_PATH $DST_OWNER_PATH || error_handle "default_data" $LINENO
-        log I "mig_copy $SRC_OWNER_PATH $DST_OWNER_PATH "
-    fi
-    if [ -e $SRC_GUEST_PATH ]; then
-        mig_copy $SRC_GUEST_PATH $DST_GUEST_PATH || error_handle "default_data" $LINENO
-        log I "mig_copy $SRC_GUEST_PATH $DST_GUEST_PATH "
-    fi
+    mig_copy $SRC_OWNER_PATH $DST_OWNER_PATH || error_handle "default_data" $LINENO
+    mig_copy $SRC_GUEST_PATH $DST_GUEST_PATH || error_handle "default_data" $LINENO
+
+    log I "multi-assistant Migration DONE"
 }
 
 # trace flag check & enable