diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-07-01 13:32:29 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-07-01 13:33:21 +0300 |
| commit | b159b8bfe615b7fb273d652b9c9bbc9f04901873 (patch) | |
| tree | d8c3b9b7ac5e31ac46d68895985014e443ba7572 /scripts | |
| parent | cad8f2bf2c02fbe2a6f406d51103909d78033c9d (diff) | |
| parent | 264e617c58d537d12a03b5f3fb73f5129fcadc09 (diff) | |
| download | vaadin-framework-b159b8bfe615b7fb273d652b9c9bbc9f04901873.tar.gz vaadin-framework-b159b8bfe615b7fb273d652b9c9bbc9f04901873.zip | |
Merge remote-tracking branch 'origin/master' into grid
Conflicts:
WebContent/release-notes.html
Change-Id: I515edf75b3ba2eb0bf94fa0d747cadbce2c79a21
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install-local-maven.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/install-local-maven.sh b/scripts/install-local-maven.sh index 2883258808..f36b603db9 100755 --- a/scripts/install-local-maven.sh +++ b/scripts/install-local-maven.sh @@ -10,31 +10,31 @@ fi for base in * do - if [ ! -d $base ] + if [ ! -d "$base" ] then continue fi - pushd $base - version=`ls $base-*.pom|sed "s/$base-//"|sed "s/.pom//"` + pushd "$base" + version=`ls "$base"-*.pom|sed "s/$base-//"|sed "s/.pom//"` pomTemplate="$base-$version.pom" if [ -e "$pomTemplate" ] then - id=$base-$version - pomFile=$pomTemplate-modified - file=$id.jar - javadocFile=$id-javadoc.jar - sourcesFile=$id-sources.jar + id="$base-$version" + pomFile="$pomTemplate-modified" + file="$id.jar" + javadocFile="$id-javadoc.jar" + sourcesFile="$id-sources.jar" # Install using real version for easy testing - cat $pomTemplate|sed "s/<version>7.*-SNAPSHOT</<version>$version</g" > $pomFile + cat "$pomTemplate"|sed "s/<version>7.*-SNAPSHOT</<version>$version</g" > "$pomFile" echo "Installing $base $version..." if [ -e "$javadocFile" ] then - mvn org.apache.maven.plugins:maven-install-plugin:2.5.1:install-file -DpomFile=$pomFile -Djavadoc=$javadocFile -Dsources=$sourcesFile -Dfile=$file + mvn org.apache.maven.plugins:maven-install-plugin:2.5.1:install-file -DpomFile="$pomFile" -Djavadoc="$javadocFile" -Dsources="$sourcesFile" -Dfile="$file" else - mvn org.apache.maven.plugins:maven-install-plugin:2.5.1:install-file -DpomFile=$pomFile -Dfile=$file + mvn org.apache.maven.plugins:maven-install-plugin:2.5.1:install-file -DpomFile="$pomFile" -Dfile="$file" fi fi popd |