From: brianjjones <brian.j.jones@intel.com>
Date: Wed, 25 Jun 2014 22:37:16 +0000 (-0700)
Subject: Updating spec file to work with Multi user changes - TC-1257
X-Git-Tag: submit/tizen_ivi/20140625.231235
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Fsubmit%2Ftizen_ivi%2F20140625.231235;p=profile%2Fivi%2FModello_Installer.git

Updating spec file to work with Multi user changes - TC-1257

Change-Id: I32f767e03c67cdee2927a29bcee8abe1e7c3d3b9
Signed-off-by: brianjjones <brian.j.jones@intel.com>
---

diff --git a/Makefile b/Makefile
index 839737f..f9ed01e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PROJECT = Modello_Installer
 
-VERSION := 0.0.1
+VERSION := 0.0.2
 PACKAGE = $(PROJECT)-$(VERSION)
 
 all:
diff --git a/packaging/modello-installer.changes b/packaging/modello-installer.changes
index 842b65f..1677022 100644
--- a/packaging/modello-installer.changes
+++ b/packaging/modello-installer.changes
@@ -1,3 +1,6 @@
+* Wed Jun 25 2014 brianjjones <brian.j.jones@intel.com> accepted/tizen/ivi/20140526.130801-2-g16cd2d4
+- Updating spec file to work with Multi user changes - TC-1257
+
 * Thu May 22 2014 brianjjones <brian.j.jones@intel.com> submit/tizen_ivi/20140515.205426@3188659
 - Fixes for IVI-3190 - To get things to render normally
 
diff --git a/packaging/modello-installer.spec b/packaging/modello-installer.spec
index 70dda7d..24d1394 100644
--- a/packaging/modello-installer.spec
+++ b/packaging/modello-installer.spec
@@ -1,6 +1,10 @@
+%define MODELLO_INSTALL_USER app
+%define MODELLO_WIDGET_DIR /opt/usr/apps/.preinstallWidgets
+%define MODELLO_COMMON_DIR /opt/usr/apps/_common
+
 Name:       Modello_Installer
 Summary:    Installer for Modello
-Version:    0.0.1
+Version:    0.0.2
 Release:    1
 Group:      Applications/System
 License:    Apache 2.0
@@ -44,26 +48,26 @@ for list in $(find $TZ_SYS_APP_PREINSTALL -name "Modello*")
 do
 	#XWalk requires you not be root to install files
 	echo "Installing $list"
-	su "$TZ_USER_NAME" -c "xwalkctl -i $list"
+	su %{MODELLO_INSTALL_USER} -c "xwalkctl -i $list"
 done
 
-for list2 in $(ls -d $TZ_SYS_HOME/$TZ_USER_NAME/.config/xwalk-service/applications/*/)
+for list2 in $(ls -d $TZ_SYS_HOME/%{MODELLO_INSTALL_USER}/.config/xwalk-service/applications/*/)
 do
-        su "$TZ_USER_NAME" -c "mkdir -p '$list2/css'"
-	su "$TZ_USER_NAME" -c "mkdir -p '$list2/js'"
-	su "$TZ_USER_NAME" -c "cp -r $TZ_USER_APP/_common/js/services '$list2/js/'"
-	su "$TZ_USER_NAME" -c "cp -r $TZ_USER_APP/_common/css/* '$list2/css/'"
-	su "$TZ_USER_NAME" -c "cp -r $TZ_USER_APP/_common/icons '$list2/'"
+        su %{MODELLO_INSTALL_USER} -c "mkdir -p '$list2/css'"
+	su %{MODELLO_INSTALL_USER} -c "mkdir -p '$list2/js'"
+	su %{MODELLO_INSTALL_USER} -c "cp -r %{MODELLO_COMMON_DIR}/js/services '$list2/js/'"
+	su %{MODELLO_INSTALL_USER} -c "cp -r %{MODELLO_COMMON_DIR}/css/* '$list2/css/'"
+	su %{MODELLO_INSTALL_USER} -c "cp -r %{MODELLO_COMMON_DIR}/icons '$list2/'"
 done
 
 %postun xwalk
 
 source %_sysconfdir/tizen-platform.conf
 
-for list3 in $(su "$TZ_USER_NAME" -c "xwalkctl" | grep Modello | cut -c 1-32)
+for list3 in $(su %{MODELLO_INSTALL_USER} -c "xwalkctl" | grep Modello | cut -c 1-32)
 do
 	echo "Uninstalling $list3"
-	su "$TZ_USER_NAME" -c "xwalkctl -u $list3"
+	su %{MODELLO_INSTALL_USER} -c "xwalkctl -u $list3"
 done
 
 #------------------------------------------------------------------------------------
@@ -85,12 +89,12 @@ do
         wrt-installer -i $list
 done
 
-for list2 in $(ls -d $TZ_USER_APP/*/)
+for list2 in $(ls -d /opt/usr/apps/*/)
 do
         mkdir -p "$list2/css"
         mkdir -p "$list2/js"
-        cp -r $TZ_USER_APP/_common/js/services "$list2/res/wgt/js/"
-        cp -r $TZ_USER_APP/_common/css/* "$list2/res/wgt/css/"
+        cp -r %{MODELLO_COMMON_DIR}/js/services "$list2/res/wgt/js/"
+        cp -r %{MODELLO_COMMON_DIR}/css/* "$list2/res/wgt/css/"
 done
 
 %files xwalk