Update upgrade script

1. Check for the existence of the source directory
2. Remove the error message for existing destination directories
3. Exclude the 'skel' directory from migration

Change-Id: I1e43dd64f6041ffbf290e187f55b75a027de7f11

diff --git a/script/migration/multi-assistant.sh b/script/migration/multi-assistant.sh
index 3bfb99e95a5bdfbf5a9e705e9b620ea184b95f65..de3436d4e70dedcf37d7abe135ef653614fa39b9 100644 (file)
--- a/script/migration/multi-assistant.sh
+++ b/script/migration/multi-assistant.sh
@@ -24,8 +24,6 @@ function set_dst_path() {
         mkdir -p -m 0755 $1
         chsmack -t $1
         chsmack -a "User::App::Shared" $1
-    else
-        log E "Already exist path $1"
     fi
 }
 
@@ -37,29 +35,25 @@ function multi_assistant_migration() {
     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"
-    local SRC_GLOBAL_PATH=$(get_old_rw_path)/etc/skel/share/.multiassistant/
-    log I "SRC_GLOBAL_PATH : $SRC_GLOBAL_PATH"
 
     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"
-    local DST_GLOBAL_PATH=$(get_rw_path)/etc/skel/share/.multiassistant/
-    log I "DST_GLOBAL_PATH : $DST_GLOBAL_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"
-    set_dst_path $DST_GLOBAL_PATH
-    log I "DST_GLOBAL_PATH creation completed"
 
-    mig_copy $SRC_OWNER_PATH $DST_OWNER_PATH || error_handle "default_data" $LINENO
-    log I "mig_copy $SRC_OWNER_PATH $DST_OWNER_PATH "
-    mig_copy $SRC_GUEST_PATH $DST_GUEST_PATH || error_handle "default_data" $LINENO
-    log I "mig_copy $SRC_GUEST_PATH $DST_GUEST_PATH "
-    mig_copy $SRC_GLOBAL_PATH $DST_GLOBAL_PATH || error_handle "default_data" $LINENO
-    log I "mig_copy $SRC_GLOBAL_PATH $DST_GLOBAL_PATH "
+    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
 }
 
 # trace flag check & enable