Skip to content

Commit

Permalink
Merge branch 'release/1.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
Francesco Barchetta committed Apr 18, 2016
2 parents 65a7fde + 3d7f51c commit 1d48c54
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Log on the developer sandbox and run these commands in a shell:

```bash
cd
git clone git@github.com:geohazards-tep/InSAR-ROI_PAC.git
git clone https://github.com/Terradue/InSAR-ROI_PAC.git
cd InSAR-ROI_PAC
git checkout develop
mvn install
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<packaging>rpm</packaging>
<name>InSAR-ROI_PAC</name>
<description>InSAR-ROI_PAC</description>
<version>1.4</version>
<version>1.7</version>

<scm>
<connection>scm:git:[email protected]:Terradue/InSAR-ROI_PAC.git</connection>
Expand Down
5 changes: 2 additions & 3 deletions src/main/app-resources/roipac/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,8 @@ done

# retrieve the DEM
mkdir -p $TMPDIR/workdir/dem
wps_result="$( ciop-browseresults -r ${CIOP_WF_RUN_ID} -j node_dem -w | tr -d '\r' | tr '\n' ';')"
ciop-log "DEBUG" "dem wps results 1 is ${wps_result}"
wps_result=`echo $wps_result | cut -d ";" -f 1`
demRes="$( cat $TMPDIR/input | grep 'node_dem')"
wps_result="$( ciop-browseresults -R $demRes | tr -d '\r')" #just a parser of result.xml and metalink
ciop-log "DEBUG" "dem wps results is ${wps_result}"

# extract the result URL
Expand Down

0 comments on commit 1d48c54

Please sign in to comment.