From f3f74b9ff54d0c4f065c32444cae3695485f869a Mon Sep 17 00:00:00 2001
From: Soonho Kong <soonhok@cs.cmu.edu>
Date: Thu, 5 Sep 2013 20:53:21 -0700
Subject: [PATCH] Fix .travis files

- OSX sed expects parameter for "-i" option
- for Windows and OSX build, we need to get the commit hash of HEAD~
  instead of HEAD because we made an extra commit to trigger the build
---
 .travis.osx.yml     | 10 +++++-----
 .travis.windows.yml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.osx.yml b/.travis.osx.yml
index 6180249ec..97a422e7e 100644
--- a/.travis.osx.yml
+++ b/.travis.osx.yml
@@ -21,7 +21,7 @@ before_script:
 script:
 - cd build
 - SITE=OSX10.8.2@Travis
-- GIT_COMMIT=`git log --oneline -n 1 | cut -d ' ' -f 1`
+- GIT_COMMIT=`git log HEAD~ --oneline -n 1 | cut -d ' ' -f 1`
 - if [[ $CMAKE_BUILD_TYPE == RELEASE ]]; then
       BUILD_TYPE=Release;
   else
@@ -29,11 +29,11 @@ script:
   fi
 - BUILD_NAME=${TRAVIS_BRANCH}_${GIT_COMMIT}_g++-4.9.0_${BUILD_TYPE}
 - CONFIG_FILE=DartConfiguration.tcl
-- sed -i "s/^Site:.*/Site:$SITE/" $CONFIG_FILE
-- sed -i "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE
+- sed -i "" "s/^Site:.*/Site:$SITE/" $CONFIG_FILE
+- sed -i "" "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE
 - ctest -D ExperimentalConfigure
-- sed -i "s/^Site:.*/Site:$SITE/" $CONFIG_FILE
-- sed -i "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE
+- sed -i "" "s/^Site:.*/Site:$SITE/" $CONFIG_FILE
+- sed -i "" "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE
 - ctest -D ExperimentalBuild -VV
 - yes "C" | ctest -D ExperimentalTest -VV
 - cd ..
diff --git a/.travis.windows.yml b/.travis.windows.yml
index 75bed7373..ffd49c385 100644
--- a/.travis.windows.yml
+++ b/.travis.windows.yml
@@ -28,7 +28,7 @@ script:
   - cd build
   - cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ../src -DCMAKE_TOOLCHAIN_FILE=/tmp/mxe/usr/x86_64-w64-mingw32/share/cmake/mxe-conf.cmake
   - SITE=Windows@Travis
-  - GIT_COMMIT=`git log --oneline -n 1 | cut -d ' ' -f 1`
+  - GIT_COMMIT=`git log HEAD~ --oneline -n 1 | cut -d ' ' -f 1`
   - if [[ $CMAKE_BUILD_TYPE == RELEASE ]]; then
         BUILD_TYPE=Release;
     else