From a5dbcb3f38ab07cd3e79ef275022d15e8f692b46 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Mon, 23 Oct 2017 22:52:29 +0700
Subject: [PATCH] IDEMPIERE-3353:sync development profile (eclipse) and package
 profile

keep update-prd.sh can install/uninstall normal feature
---
 .../update-prd.sh                                     | 11 +++++++++--
 org.idempiere.equinox.p2.director-feature/update.sh   |  5 ++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/org.idempiere.equinox.p2.director-feature/update-prd.sh b/org.idempiere.equinox.p2.director-feature/update-prd.sh
index 6f0ab3fcfb..05f7af4bfc 100644
--- a/org.idempiere.equinox.p2.director-feature/update-prd.sh
+++ b/org.idempiere.equinox.p2.director-feature/update-prd.sh
@@ -5,5 +5,12 @@ cd $(dirname "${0}")
 DESTINATION=$(pwd)
 
 VMOPTS="-Declipse.log.level=ALL -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true"
-java $VMOPTS -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -u "$2, org.idempiere.fitnesse.feature.group"
-java $VMOPTS -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -i "$2, org.eclipse.equinox.p2.director, org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group"
\ No newline at end of file
+
+INSTALL_UI="$2"
+UNINSTALL_UI="$2"
+if [ -n "$3" ]; then
+	# case update org.adempiere.server.product, install and un-install is difference 
+	UNINSTALL_UI="$3"
+fi
+java $VMOPTS -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -u "$UNINSTALL_UI"
+java $VMOPTS -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -i "$INSTALL_UI"
\ No newline at end of file
diff --git a/org.idempiere.equinox.p2.director-feature/update.sh b/org.idempiere.equinox.p2.director-feature/update.sh
index e26cf3b792..ed89fddb6a 100644
--- a/org.idempiere.equinox.p2.director-feature/update.sh
+++ b/org.idempiere.equinox.p2.director-feature/update.sh
@@ -33,7 +33,10 @@ then
    cp jettyhome/etc/jetty-selector.xml jetty-selector.xml.sav
 fi
 
-$DESTINATION/update-prd.sh $1 org.adempiere.server.product
+UNINSTALL_UI="org.adempiere.server.product, org.idempiere.fitnesse.feature.group"
+INSTALL_UI="org.adempiere.server.product, org.eclipse.equinox.p2.director, org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group"
+
+$DESTINATION/update-prd.sh $1 "$INSTALL_UI" "$UNINSTALL_UI"
 
 cp idempiere.ini.sav idempiere.ini