gCubeSystem
/
smartgears-distribution
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Luca Frosini 2016-01-08 14:14:41 +00:00
parent a2f04b4927
commit 72644eb414
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
distro/contents/install
View File

@ -216,14 +216,15 @@ function change_line {
sed -i '/'"${OLD_LINE_PATTERN}"'/s/.*/'"${NEW}"'/' "${FILE}" sed -i '/'"${OLD_LINE_PATTERN}"'/s/.*/'"${NEW}"'/' "${FILE}"
} }
function replace_property { function replace_property {
local PROPERTY=$1 local PROPERTY=$1
#local OLD_LINE=$(sed -n "/${PROPERTY}/p" $ghnhome/container.xml)
local NEW_LINE=$(sed -n "/${PROPERTY}/p" $distro/container.xml) local NEW_LINE=$(sed -n "/${PROPERTY}/p" $distro/container.xml)
#echo "Replacing property ${PROPERTY}:" #echo "Replacing property ${PROPERTY}:"
#local OLD_LINE=$(sed -n "/${PROPERTY}/p" $ghnhome/container.xml)
#echo $OLD_LINE #echo $OLD_LINE
#echo $NEW_LINE #echo $NEW_LINE
change_line ${PROPERTY} ${NEW_LINE} $ghnhome/container.xml change_line "${PROPERTY}" "${NEW_LINE}" $ghnhome/container.xml
#echo "done." #echo "done."
} }
@ -257,6 +258,7 @@ if [ -z "$dryrun" ]; then
fi fi
#creating the symlink to shared and apps folder #creating the symlink to shared and apps folder
if [ -z "$dryrun" ]; then if [ -z "$dryrun" ]; then
ln -s $shared $ghnhome/lib ln -s $shared $ghnhome/lib
fi fi

8
pom.xml
View File

@ -41,8 +41,12 @@
<artifactId>common-smartgears</artifactId> <artifactId>common-smartgears</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.accounting</groupId> <groupId>org.gcube.data.publishing</groupId>
<artifactId>accounting-lib-persistence-couchdb</artifactId> <artifactId>document-store-lib</artifactId>
</dependency>
<dependency>
<groupId>org.gcube.data.publishing</groupId>
<artifactId>document-store-lib-couchdb</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>