From 1b5fa04f5f1f6fcbae684d277dc878ed97b151f8 Mon Sep 17 00:00:00 2001
From: Tomasz Iwanek <t.iwanek@samsung.com>
Date: Thu, 24 Mar 2016 11:52:10 +0100
Subject: [PATCH] Modify scripts to create proper delta package for wgt-backend

Always add "config.xml" and "tizen-manifest.xml" file to delta package.

Change-Id: Iae8f1fa193334de8993fdf6fce3da1b7422994b6
---
 CMakeLists.txt                 |   4 +-
 data/pkgmgr-create-delta.sh.in | 159 ++++++++++++++++++++++++-----------------
 data/pkgmgr-unzip-pkg.sh.in    |  78 ++++++++++++++++++++
 data/pkgmgr-unzip-tpk.sh.in    |  78 --------------------
 packaging/pkgmgr-tool.spec     |   2 +-
 src/delta.c                    |   6 ++
 src/pkg_cmd.c                  |  26 +++----
 7 files changed, 192 insertions(+), 161 deletions(-)
 create mode 100644 data/pkgmgr-unzip-pkg.sh.in
 delete mode 100644 data/pkgmgr-unzip-tpk.sh.in

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb688e6..4661309 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,7 +73,7 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/mime.tpk.xml DESTINATION /usr/sha
 
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/data/pkgmgr.patch.sh.in pkgmgr.patch.sh @ONLY)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pkgmgr.patch.sh DESTINATION ${SYSCONF_INSTALL_DIR}/opt/upgrade/)
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/data/pkgmgr-unzip-tpk.sh.in pkgmgr-unzip-tpk.sh @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pkgmgr-unzip-tpk.sh DESTINATION ${SYSCONF_INSTALL_DIR}/package-manager/)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/data/pkgmgr-unzip-pkg.sh.in pkgmgr-unzip-pkg.sh @ONLY)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pkgmgr-unzip-pkg.sh DESTINATION ${SYSCONF_INSTALL_DIR}/package-manager/)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/data/pkgmgr-create-delta.sh.in pkgmgr-create-delta.sh @ONLY)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pkgmgr-create-delta.sh DESTINATION ${SYSCONF_INSTALL_DIR}/package-manager/)
diff --git a/data/pkgmgr-create-delta.sh.in b/data/pkgmgr-create-delta.sh.in
index 747ddc0..b22963e 100644
--- a/data/pkgmgr-create-delta.sh.in
+++ b/data/pkgmgr-create-delta.sh.in
@@ -4,22 +4,22 @@ usage()
     cat <<EOF
 usage:
     $1
-	-a|--old_tpk=<old_tpk>
-	-b|--new_tpk=<new_tpk>
-	-p|--delta_tpk=<delta_tpk>
+	-a|--old_pkg=<old_pkg>
+	-b|--new_pkg=<new_pkg>
+	-p|--delta_pkg=<delta_pkg>
 	[-o|--option=<option>]
 	[-h|--help]
 Mandatory args:
- -a|--old_tpk		full/absolute delta_tpk of old_tpk
- -b|--new_tpk		full/absolute delta_tpk of new_tpk
- -p|--delta_tpk		delta_tpk for delta dir
+ -a|--old_pkg		full/absolute delta_pkg of old_pkg
+ -b|--new_pkg		full/absolute delta_pkg of new_pkg
+ -p|--delta_pkg		delta_pkg for delta dir
 Optional args:
  -h,--help			print this help
 EOF
   return 0
 }
 
-options=$(getopt -o hp:a:b:p: -l help,old_tpk:,new_tpk:,delta_tpk: -- "$@")
+options=$(getopt -o hp:a:b:p: -l help,old_pkg:,new_pkg:,delta_pkg: -- "$@")
 if [ $? -ne 0 ]; then
     usage $(basename $0)
     exit 1
@@ -30,21 +30,21 @@ while true
 do
     case "$1" in
         -h|--help)		usage $0 && exit 0;;
-        -a|--old_tpk)	old_tpk=$2; shift 2;;
-        -b|--new_tpk)	new_tpk=$2; shift 2;;
-        -p|--delta_tpk)	delta_tpk=$2; shift 2;;
+        -a|--old_pkg)	old_pkg=$2; shift 2;;
+        -b|--new_pkg)	new_pkg=$2; shift 2;;
+        -p|--delta_pkg)	delta_pkg=$2; shift 2;;
         --)             shift 1; break ;;
         *)              break ;;
     esac
 done
 
-if [ -z "$old_tpk" ]; then
-    echo "'old_tpk' parameter is required"
+if [ -z "$old_pkg" ]; then
+    echo "'old_pkg' parameter is required"
     exit 1
 fi
 
-if [ -z "$new_tpk" ]; then
-    echo "'new_tpk' parameter is required"
+if [ -z "$new_pkg" ]; then
+    echo "'new_pkg' parameter is required"
     exit 1
 fi
 
@@ -98,8 +98,8 @@ which()
 	return $ES
 }
 
-old_tpk_unzip_path=$temp_delta_repo`basename $old_tpk`$outpath
-new_tpk_unzip_path=$temp_delta_repo`basename $new_tpk`$outpath
+old_pkg_unzip_path=$temp_delta_repo`basename $old_pkg`$outpath
+new_pkg_unzip_path=$temp_delta_repo`basename $new_pkg`$outpath
 sample_delta=$temp_delta_repo$temp_delta_dir
 
 while read line
@@ -138,61 +138,86 @@ fi
 
 while read line
 	do
-	if [[ "$line" =~ "differ" ]]; then
-		count=0
-		for word in $line
-			do
-			count=$((count+1));
-			#echo $word
-			if [ $count -eq 2 ]; then
-				file1=$word;
-				#echo "file1 delta_tpk "$file1
-			elif [ $count -eq 4 ]; then
-				file2=$word;
-				#echo "file2 delta_tpk "$file2
-			fi
-			done
-			parent_path=${file1##*$old_tpk_unzip_path}
+	count=0
+	action="none"
+	for word in $line
+		do
+		count=$((count+1));
+		if [ $count -eq 1 ]; then
+			 action="only"
+		elif [ $count -eq 2 ]; then
+			file1=$word;
+		elif [ $count -eq 4 ]; then
+			file2=$word;
+		elif [ $count -eq 5 ]; then
+			action="differ"
+		elif [ $count -eq 6 ]; then
+			action="same"
+		fi
+		done
+	if [[ "$action" =~ "same" ]]; then
+		if [[ "$file2" =~ "config.xml" || "$file2" =~ "tizen-manifest.xml" ]]; then
+			parent_path=${file2##*$new_pkg_unzip_path}
 			filepath=`basename $parent_path`
 			dirpath=`dirname $parent_path`
-			#echo "dirpath "$dirpath
-			#echo "filepath "$filepath
-			if [[ "$line" =~ "tizen-manifest.xml"  || "$line" =~ "signature1.xml" || "$line" =~ "author-signature.xml" ]] ; then
-				if ! mkdir -p $sample_delta$dirpath; then
-					echo "FAIL: mkdir failed !" >&2
-					cleanup
-					exit 1
-				fi
-				if ! cp -r $new_tpk_unzip_path/$dirpath/$filepath $sample_delta/$dirpath/$filepath; then
-					echo "FAIL: cp failed !" >&2
-					cleanup
-					exit 1
-				fi
-			else
-				if ! mkdir -p $sample_delta$dirpath; then
-					echo "FAIL: mkdir failed!" >&2
-					cleanup
-					exit 1
-				fi
-				if ! xdelta3 -e -s $file1 $file2 $sample_delta$dirpath/$filepath; then
-					echo "FAIL: xdelta3 failed!" >&2
-					cleanup
-					exit 1
-				fi
+			if ! mkdir -p $sample_delta$dirpath; then
+				echo "FAIL: mkdir failed !" >&2
+				cleanup
+				exit 1
+			fi
+			if ! cp -r $new_pkg_unzip_path/$dirpath/$filepath $sample_delta/$dirpath/$filepath; then
+				echo "FAIL: cp failed !" >&2
+				cleanup
+				exit 1
 			fi
-
 			dirpath=${dirpath:1:${#dirpath}}
 			if [ ${#dirpath} -gt 1 ];then
 				dirpath="$dirpath/"
 			fi
-			if [[ "$line" =~ "tizen-manifest.xml"  || "$line" =~ "signature1.xml" || "$line" =~ "author-signature.xml" ]] ; then
-				`echo "<file name=\"$dirpath$filepath\" />" >> $sample_delta/added.xml`
-			else
-				`echo "<file name=\"$dirpath$filepath\" />" >> $sample_delta/modified.xml`
+			`echo "<file name=\"$dirpath$filepath\" />" >> $sample_delta/added.xml`
+		fi
+	elif [[ "$action" =~ "differ" ]]; then
+		parent_path=${file1##*$old_pkg_unzip_path}
+		filepath=`basename $parent_path`
+		dirpath=`dirname $parent_path`
+		#echo "dirpath "$dirpath
+		#echo "filepath "$filepath
+		if [[ "$file1" =~ "tizen-manifest.xml" || "$file1" =~ "signature1.xml" || "$file1" =~ "author-signature.xml" || "$file1" =~ "config.xml" ]] ; then
+			if ! mkdir -p $sample_delta$dirpath; then
+				echo "FAIL: mkdir failed !" >&2
+				cleanup
+				exit 1
 			fi
+			if ! cp -r $new_pkg_unzip_path/$dirpath/$filepath $sample_delta/$dirpath/$filepath; then
+				echo "FAIL: cp failed !" >&2
+				cleanup
+				exit 1
+			fi
+		else
+			if ! mkdir -p $sample_delta$dirpath; then
+				echo "FAIL: mkdir failed!" >&2
+				cleanup
+				exit 1
+			fi
+			if ! xdelta3 -e -s $file1 $file2 $sample_delta$dirpath/$filepath; then
+				echo "FAIL: xdelta3 failed!" >&2
+				cleanup
+				exit 1
+			fi
+		fi
+
+		dirpath=${dirpath:1:${#dirpath}}
+		if [ ${#dirpath} -gt 1 ];then
+			dirpath="$dirpath/"
+		fi
+		if [[ "$file1" =~ "tizen-manifest.xml" || "$file1" =~ "signature1.xml" || "$file1" =~ "author-signature.xml" || "$file1" =~ "config.xml" ]] ; then
+			`echo "<file name=\"$dirpath$filepath\" />" >> $sample_delta/added.xml`
+		else
+			`echo "<file name=\"$dirpath$filepath\" />" >> $sample_delta/modified.xml`
+		fi
 
-	elif [[ "$line" =~ "$old_tpk_unzip_path" ]]; then
-		parent_path=${line##*$old_tpk_unzip_path}
+	elif [[ "$action" == "only" && "$file1" =~ "$old_pkg_unzip_path" ]]; then
+		parent_path=${line##*$old_pkg_unzip_path}
 		#echo "removed " $parent_path
 		string_to_replace_with="/"
 		result_string="${parent_path/: /$string_to_replace_with}"
@@ -207,8 +232,8 @@ while read line
 			dirpath="$dirpath/"
 		fi
 		`echo "<file name=\"$dirpath$filepath\" />" >> $sample_delta/removed.xml`
-	elif [[ "$line" =~ "$new_tpk_unzip_path" ]]; then
-		parent_path=${line##*$new_tpk_unzip_path}
+	elif [[ "$action" == "only" && "$file1" =~ "$new_pkg_unzip_path" ]]; then
+		parent_path=${line##*$new_pkg_unzip_path}
 		#echo "added " $parent_path
 		string_to_replace_with="/"
 		result_string="${parent_path/: /$string_to_replace_with}"
@@ -222,7 +247,7 @@ while read line
 			cleanup
 			exit 1
 		fi
-		if ! cp -r $new_tpk_unzip_path/$dirpath/$filepath $sample_delta/$dirpath/$filepath; then
+		if ! cp -r $new_pkg_unzip_path/$dirpath/$filepath $sample_delta/$dirpath/$filepath; then
 			echo "FAIL: cp failed!" >&2
 			cleanup
 			exit 1
@@ -254,9 +279,9 @@ fi
 `rm $sample_delta/modified.xml $sample_delta/removed.xml $sample_delta/added.xml `
 `chmod -R +x $sample_delta`
 cd $sample_delta
-dirpath=`dirname $delta_tpk`
+dirpath=`dirname $delta_pkg`
 #echo $dirpath
-filepath=`basename $delta_tpk`
+filepath=`basename $delta_pkg`
 #echo $filepath
 `echo zip -r $filepath.zip *`
 if ! mv $filepath.zip $dirpath/$filepath.delta; then
diff --git a/data/pkgmgr-unzip-pkg.sh.in b/data/pkgmgr-unzip-pkg.sh.in
new file mode 100644
index 0000000..4f824b1
--- /dev/null
+++ b/data/pkgmgr-unzip-pkg.sh.in
@@ -0,0 +1,78 @@
+#!/bin/bash
+usage()
+{
+    cat <<EOF
+usage:
+    $1
+  -a|--old_pkg=<old_pkg>
+  -b|--new_pkg=<new_pkg>
+	-p|--delta_pkg=<delta_pkg>
+		[-o|--option=<option>]
+		[-h|--help]
+Mandatory args:
+ -a|--old_pkg         full/absolute delta_pkg of old_pkg
+ -b|--new_pkg         full/absolute delta_pkg of new_pkg
+ -p|--delta_pkg			delta_pkg for delta dir
+Optional args:
+  -h,--help         print this help
+EOF
+    return 0
+}
+
+options=$(getopt -o hp:a:b:p: -l help,old_pkg:,new_pkg:,delta_pkg: -- "$@")
+if [ $? -ne 0 ]; then
+    usage $(basename $0)
+    exit 1
+fi
+eval set -- "$options"
+
+while true
+do
+    case "$1" in
+        -h|--help)	usage $0 && exit 0;;
+        -a|--old_pkg)	old_pkg=$2; shift 2;;
+        -b|--new_pkg)	new_pkg=$2; shift 2;;
+        -p|--delta_pkg)	delta_pkg=$2; shift 2;;
+        --)             shift 1; break ;;
+        *)              break ;;
+    esac
+done
+
+if [ -z "$old_pkg" ]; then
+    echo "'old_pkg' parameter is required"
+    exit 1
+fi
+
+if [ -z "$new_pkg" ]; then
+    echo "'new_pkg' parameter is required"
+    exit 1
+fi
+
+temp_delta_repo="/opt/usr/temp_delta/"
+outpath="_FILES"
+
+cleanup()
+{
+	`rm -rf $temp_delta_repo`
+}
+
+cleanup
+
+if ! mkdir -p $temp_delta_repo; then
+	echo "FAIL: mkdir failed !" >&2
+	exit 1
+fi
+
+old_pkg_unzip_path=$temp_delta_repo`basename $old_pkg`$outpath
+new_pkg_unzip_path=$temp_delta_repo`basename $new_pkg`$outpath
+
+#unzip to ${package}_FILES
+if ! unzip -q $old_pkg -d $old_pkg_unzip_path; then
+	echo "FAIL: unzip $old_pkg failed!" >&2
+	exit 1
+fi
+if ! unzip -q $new_pkg -d $new_pkg_unzip_path; then
+	echo "FAIL: unzip $new_pkg failed!" >&2
+	cleanup
+	exit 1
+fi
diff --git a/data/pkgmgr-unzip-tpk.sh.in b/data/pkgmgr-unzip-tpk.sh.in
deleted file mode 100644
index 464205a..0000000
--- a/data/pkgmgr-unzip-tpk.sh.in
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-usage()
-{
-    cat <<EOF
-usage:
-    $1
-	-a|--old_tpk=<old_tpk>
-	-b|--new_tpk=<new_tpk>
-	-p|--delta_tpk=<delta_tpk>
-		[-o|--option=<option>]
-		[-h|--help]
-Mandatory args:
- -a|--old_tpk         full/absolute delta_tpk of old_tpk
- -b|--new_tpk         full/absolute delta_tpk of new_tpk
- -p|--delta_tpk			delta_tpk for delta dir
-Optional args:
-  -h,--help         print this help
-EOF
-    return 0
-}
-
-options=$(getopt -o hp:a:b:p: -l help,old_tpk:,new_tpk:,delta_tpk: -- "$@")
-if [ $? -ne 0 ]; then
-    usage $(basename $0)
-    exit 1
-fi
-eval set -- "$options"
-
-while true
-do
-    case "$1" in
-        -h|--help)	usage $0 && exit 0;;
-        -a|--old_tpk)	old_tpk=$2; shift 2;;
-        -b|--new_tpk)	new_tpk=$2; shift 2;;
-        -p|--delta_tpk)	delta_tpk=$2; shift 2;;
-        --)             shift 1; break ;;
-        *)              break ;;
-    esac
-done
-
-if [ -z "$old_tpk" ]; then
-    echo "'old_tpk' parameter is required"
-    exit 1
-fi
-
-if [ -z "$new_tpk" ]; then
-    echo "'new_tpk' parameter is required"
-    exit 1
-fi
-
-temp_delta_repo="/opt/usr/temp_delta/"
-outpath="_FILES"
-
-cleanup()
-{
-	`rm -rf $temp_delta_repo`
-}
-
-cleanup
-
-if ! mkdir -p $temp_delta_repo; then
-	echo "FAIL: mkdir failed !" >&2
-	exit 1
-fi
-
-old_tpk_unzip_path=$temp_delta_repo`basename $old_tpk`$outpath
-new_tpk_unzip_path=$temp_delta_repo`basename $new_tpk`$outpath
-
-#unzip to .tpk_FILES
-if ! unzip -q $old_tpk -d $old_tpk_unzip_path; then
-	echo "FAIL: unzip $old_tpk failed!" >&2
-	exit 1
-fi
-if ! unzip -q $new_tpk -d $new_tpk_unzip_path; then
-	echo "FAIL: unzip $new_tpk failed!" >&2
-	cleanup
-	exit 1
-fi
diff --git a/packaging/pkgmgr-tool.spec b/packaging/pkgmgr-tool.spec
index b91991f..89ca00f 100644
--- a/packaging/pkgmgr-tool.spec
+++ b/packaging/pkgmgr-tool.spec
@@ -81,6 +81,6 @@ fi
 %attr(0755,root,root) %{_bindir}/install_preload_tpk
 %{_datadir}/mime/packages/mime.wac.xml
 %{_datadir}/mime/packages/mime.tpk.xml
-%attr(0700,root,root) /etc/package-manager/pkgmgr-unzip-tpk.sh
+%attr(0700,root,root) /etc/package-manager/pkgmgr-unzip-pkg.sh
 %attr(0700,root,root) /etc/package-manager/pkgmgr-create-delta.sh
 /usr/share/license/%{name}
diff --git a/src/delta.c b/src/delta.c
index a71a212..a462766 100644
--- a/src/delta.c
+++ b/src/delta.c
@@ -246,6 +246,12 @@ void __create_diff_file(char *old_tpk_path, char *new_tpk_path)
 								rel_path_old_tpk_file,
 								rel_path_new_tpk_file);
 						__print_to_file(message);
+					} else {
+						 snprintf(message, MAX_MESSAGE_LEN,
+								  "Files %s and %s are the same",
+								  rel_path_old_tpk_file,
+								  rel_path_new_tpk_file);
+						 __print_to_file(message);
 					}
 				}
 				list_dir_new_tpk = g_list_delete_link(list_dir_new_tpk,
diff --git a/src/pkg_cmd.c b/src/pkg_cmd.c
index 1966d96..62e02b8 100644
--- a/src/pkg_cmd.c
+++ b/src/pkg_cmd.c
@@ -563,7 +563,7 @@ static int __process_request(uid_t uid)
 			snprintf(data.resolved_path_delta_pkg, PATH_MAX, "/tmp/delta_pkg");
 			printf("output file will be /tmp/delta_pkg.delta\n");
 		}
-		const char *unzip_argv[] = {"sh", "/etc/package-manager/pkgmgr-unzip-tpk.sh", "-a",
+		const char *unzip_argv[] = {"sh", "/etc/package-manager/pkgmgr-unzip-pkg.sh", "-a",
 				data.resolved_path_pkg_old, "-b", data.resolved_path_pkg_new, "-p",
 				data.resolved_path_delta_pkg, NULL};
 		ret = __xsystem(unzip_argv);
@@ -572,23 +572,23 @@ static int __process_request(uid_t uid)
 			return ret;
 		}
 		printf("unzip is success .\n");
-		char *ptr_old_tpk = NULL;
-		ptr_old_tpk = strrchr(data.resolved_path_pkg_old, '/');
-		if (!ptr_old_tpk) {
-			printf("not able to extract tpk name.\n");
+		char *ptr_old_pkg = NULL;
+		ptr_old_pkg = strrchr(data.resolved_path_pkg_old, '/');
+		if (!ptr_old_pkg) {
+			printf("not able to extract package name.\n");
 			break;
 		}
-		ptr_old_tpk++;
-		char *ptr_new_tpk = NULL;
-		ptr_new_tpk = strrchr(data.resolved_path_pkg_new, '/');
-		if (!ptr_new_tpk) {
-			printf("not able to extract tpk name.\n");
+		ptr_old_pkg++;
+		char *ptr_new_pkg = NULL;
+		ptr_new_pkg = strrchr(data.resolved_path_pkg_new, '/');
+		if (!ptr_new_pkg) {
+			printf("not able to extract package name.\n");
 			break;
 		}
-		ptr_new_tpk++;
+		ptr_new_pkg++;
 
-		snprintf(pkg_old, PATH_MAX, "%s%s%s", TEMP_DELTA_REPO, ptr_old_tpk, UNZIPFILE);
-		snprintf(pkg_new, PATH_MAX, "%s%s%s", TEMP_DELTA_REPO, ptr_new_tpk, UNZIPFILE);
+		snprintf(pkg_old, PATH_MAX, "%s%s%s", TEMP_DELTA_REPO, ptr_old_pkg, UNZIPFILE);
+		snprintf(pkg_new, PATH_MAX, "%s%s%s", TEMP_DELTA_REPO, ptr_new_pkg, UNZIPFILE);
 		__create_diff_file(pkg_old, pkg_new);
 
 		const char *delta_argv[] = {"sh", "/etc/package-manager/pkgmgr-create-delta.sh", "-a",
-- 
2.7.4