Add number and cleanup upgrade scripts

Change-Id: I6eaf817cab1a4b9555564a3f2a91f9264feee47c
Signed-off-by: sangwan.kwon <sangwan.kwon@samsung.com>

diff --git a/etc/upgrade/cert-svc-db-upgrade.sh.in b/etc/upgrade/202.cert-svc-db-upgrade.sh.in
similarity index 98%
rename from etc/upgrade/cert-svc-db-upgrade.sh.in
rename to etc/upgrade/202.cert-svc-db-upgrade.sh.in
index 5f172e7..0644383 100755 (executable)
--- a/etc/upgrade/cert-svc-db-upgrade.sh.in
+++ b/etc/upgrade/202.cert-svc-db-upgrade.sh.in
@@ -15,7 +15,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
-# @file        cert-svc-db-upgrade.sh.in
+# @file        202.cert-svc-db-upgrade.sh.in
 # @author      Sangwan Kwon (sangwan.kwon@samsung.com)
 # @brief       cert-svc db migration scripts for platform upgrade 2.4 -> 3.0
 #

diff --git a/etc/upgrade/cert-svc-disabled-certs-upgrade.sh.in b/etc/upgrade/203.cert-svc-disabled-certs-upgrade.sh.in
similarity index 92%
rename from etc/upgrade/cert-svc-disabled-certs-upgrade.sh.in
rename to etc/upgrade/203.cert-svc-disabled-certs-upgrade.sh.in
index 6090624..f79dd14 100755 (executable)
--- a/etc/upgrade/cert-svc-disabled-certs-upgrade.sh.in
+++ b/etc/upgrade/203.cert-svc-disabled-certs-upgrade.sh.in
@@ -15,13 +15,11 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
-# @file        cert-svc-disabled-certs-upgrade.sh.in
+# @file        203.cert-svc-disabled-certs-upgrade.sh.in
 # @author      Sangwan Kwon (sangwan.kwon@samsung.com)
 # @brief       cert-svc disabled certs upgrade for platform upgrade 2.4 -> 3.0
 #
 
-# TODO(sangwan.kwon) Migration user certs(WIFI, VPN, EMAIL)
-
 # check this script invoked by cert-svc-db-upgrade
 if [ "$#" != "2" ]
 then
@@ -60,7 +58,6 @@ do
 
        if [ "$ret" == "1" ]
        then
-               # TODO(sangwan.kwon) Consider is_root_app column (it depends on master app)
                # update ssl, disabled_certs table
                gname=`sqlite3 $NEW_DB "SELECT gname FROM ssl WHERE certificate='$certs';"`
                sqlite3 $NEW_DB "INSERT INTO disabled_certs VALUES ('$gname', '$certs');"

diff --git a/etc/upgrade/CMakeLists.txt b/etc/upgrade/CMakeLists.txt
index 7d5ad25..74096a4 100644 (file)
--- a/etc/upgrade/CMakeLists.txt
+++ b/etc/upgrade/CMakeLists.txt
@@ -17,14 +17,14 @@
 #
 
 CONFIGURE_FILE(
-       cert-svc-db-upgrade.sh.in
-       cert-svc-db-upgrade.sh @ONLY)
+       202.cert-svc-db-upgrade.sh.in
+       202.cert-svc-db-upgrade.sh @ONLY)
 CONFIGURE_FILE(
-       cert-svc-disabled-certs-upgrade.sh.in
-       cert-svc-disabled-certs-upgrade.sh @ONLY)
+       203.cert-svc-disabled-certs-upgrade.sh.in
+       203.cert-svc-disabled-certs-upgrade.sh @ONLY)
 
 INSTALL(FILES
-       cert-svc-db-upgrade.sh
-       cert-svc-disabled-certs-upgrade.sh
+       202.cert-svc-db-upgrade.sh
+       203.cert-svc-disabled-certs-upgrade.sh
        DESTINATION ${UPGRADE_SCRIPT_PATH}
 )

diff --git a/packaging/cert-svc.spec b/packaging/cert-svc.spec
index 6a469d5..d35f2a3 100644 (file)
--- a/packaging/cert-svc.spec
+++ b/packaging/cert-svc.spec
@@ -178,8 +178,8 @@ fi
 %attr(-, %{user_name}, %{group_name}) %cert_svc_db_path/certs-meta.db-journal
 %attr(-, %{user_name}, %{group_name}) %cert_svc_ro_path
 
-%attr(755, root, root) %upgrade_script_path/cert-svc-db-upgrade.sh
-%attr(755, root, root) %upgrade_script_path/cert-svc-disabled-certs-upgrade.sh
+%attr(755, root, root) %upgrade_script_path/202.cert-svc-db-upgrade.sh
+%attr(755, root, root) %upgrade_script_path/203.cert-svc-disabled-certs-upgrade.sh
 %upgrade_data_path/certs-meta.db
 
 %files devel