Skip to content

Commit

Permalink
Fix env.sh and build-ide-local-trunk scripts to properly set the git.…
Browse files Browse the repository at this point in the history
…hash Java environment variable.
  • Loading branch information
lindydonna committed Mar 18, 2011
1 parent 680ff3b commit f5144c3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions org.scala-ide.build/build-ide-local-trunk.sh
Expand Up @@ -8,4 +8,5 @@ ${MAVEN} \
-U \
-P local-scala-trunk,!scala-trunk \
-Dscala.version=${SCALA_VERSION} \
-Dgit.hash=${GIT_HASH} \
clean install $*
6 changes: 3 additions & 3 deletions org.scala-ide.build/env.sh
@@ -1,5 +1,8 @@
#!/bin/sh

GIT_HASH="`git log -1 --pretty=format:"%h"`"
echo "Last commit git hash:" $GIT_HASH

# MAVEN needs to point to a MAVEN3 installation:
if which mvn >/dev/null; then
mvn -version | grep "Maven 3" > /dev/null
Expand All @@ -17,9 +20,6 @@ fi

build()
{
GIT_HASH="`git log -1 --pretty=format:"%h"`"
echo "Last commit git hash:" $GIT_HASH

${MAVEN} \
-U \
-Dscala.version=${SCALA_VERSION} \
Expand Down

0 comments on commit f5144c3

Please sign in to comment.