Bug 411487 - CBI Build: Build Scout from Tag https://bugs.eclipse.org/bugs/show_bug.cgi?id=411487 Adds special handling for Scout 3.8 directory in publish shell script. Change-Id: I4ec426b21bc4ec31ab9632ba3bcfedc88ee38ef7 Reviewed-on: https://git.eclipse.org/r/15081 Reviewed-by: Ken Lee <kle@bsiag.com> IP-Clean: Ken Lee <kle@bsiag.com> Tested-by: Ken Lee <kle@bsiag.com>
diff --git a/org.eclipse.scout.maven.plugins.updatesite/publish.sh b/org.eclipse.scout.maven.plugins.updatesite/publish.sh index 05136a5..73ff3cf 100644 --- a/org.eclipse.scout.maven.plugins.updatesite/publish.sh +++ b/org.eclipse.scout.maven.plugins.updatesite/publish.sh
@@ -80,6 +80,11 @@ fi done popd > /dev/null + # special handling for Scout 3.8 since folder structure is different. + if echo ${curdir} | grep -w -q "3.8"; then + echo -e "\t\tTruncating Scout ${curdir} composite dir" + truncateComposite "$curdir" + fi } ## removes all folders starting with N that are not contained in the compositeContent.jar @@ -88,7 +93,7 @@ compositeDir=$1 cd ${compositeDir} - unzip -q compositeContent.jar + unzip -q -o compositeContent.jar for sub in N* do echo -e "\t\t\tChecking nightly dir ${sub}"