From 72644eb41423e0bf5a34d311063f19887574f1cc Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 8 Jan 2016 14:14:41 +0000 Subject: [PATCH] refs #1268: smartgears-distribution 1.2.6: distribution field on monitor is missing when a smartgears node is upgraded https://support.d4science.org/issues/1268 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/distributions/smartgears-distribution@122167 82a268e6-3cf1-43bd-a215-b396298e98cf --- distro/contents/install | 6 ++++-- pom.xml | 8 ++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/distro/contents/install b/distro/contents/install index 076e8b3..3f959e0 100755 --- a/distro/contents/install +++ b/distro/contents/install @@ -216,14 +216,15 @@ function change_line { sed -i '/'"${OLD_LINE_PATTERN}"'/s/.*/'"${NEW}"'/' "${FILE}" } + function replace_property { local PROPERTY=$1 + #local OLD_LINE=$(sed -n "/${PROPERTY}/p" $ghnhome/container.xml) local NEW_LINE=$(sed -n "/${PROPERTY}/p" $distro/container.xml) #echo "Replacing property ${PROPERTY}:" - #local OLD_LINE=$(sed -n "/${PROPERTY}/p" $ghnhome/container.xml) #echo $OLD_LINE #echo $NEW_LINE - change_line ${PROPERTY} ${NEW_LINE} $ghnhome/container.xml + change_line "${PROPERTY}" "${NEW_LINE}" $ghnhome/container.xml #echo "done." } @@ -257,6 +258,7 @@ if [ -z "$dryrun" ]; then fi #creating the symlink to shared and apps folder + if [ -z "$dryrun" ]; then ln -s $shared $ghnhome/lib fi diff --git a/pom.xml b/pom.xml index 4ae1bb1..86caf99 100644 --- a/pom.xml +++ b/pom.xml @@ -41,8 +41,12 @@ common-smartgears - org.gcube.accounting - accounting-lib-persistence-couchdb + org.gcube.data.publishing + document-store-lib + + + org.gcube.data.publishing + document-store-lib-couchdb [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) runtime