summaryrefslogtreecommitdiff
path: root/setup_environment
diff options
context:
space:
mode:
authortgrogers <[email protected]>2018-05-09 15:12:52 -0400
committertgrogers <[email protected]>2018-05-09 15:12:52 -0400
commit57c17b0e7a2bba50a51fdfc8e66123d628ff4ae8 (patch)
treeb09153fb84d4fd7491bdceef30fe297c45d6718d /setup_environment
parent7d2b1a546cfc4a03eac998fa37b7720ce9e68109 (diff)
parentcdb59de6dc329ce5777e3c961c09d26f37d32fec (diff)
Merge remote-tracking branch 'public/dev' into dev
Diffstat (limited to 'setup_environment')
-rw-r--r--setup_environment3
1 files changed, 2 insertions, 1 deletions
diff --git a/setup_environment b/setup_environment
index f6a16c5..a9813c2 100644
--- a/setup_environment
+++ b/setup_environment
@@ -8,7 +8,8 @@ export GPGPUSIM_ROOT="$( cd "$( dirname "$BASH_SOURCE" )" && pwd )"
GPGPUSIM_VERSION_STRING=`cat $GPGPUSIM_ROOT/version | awk '/Version/ {print $8}'`
#Detect Git branch and commit #
GIT_COMMIT=`git log -n 1 | head -1 | sed -re 's/commit (.*)/\1/'`
-GIT_FILES_CHANGED=`git diff --numstat --cached && git diff --numstat | wc | sed -re 's/^\s+([0-9]+).*/\1/'`
+GIT_FILES_CHANGED=`git diff --numstat | wc | sed -re 's/^\s+([0-9]+).*/\1./'`
+GIT_FILES_CHANGED+=`git diff --numstat --cached | wc | sed -re 's/^\s+([0-9]+).*/\1/'`
GPGPUSIM_BUILD_STRING="gpgpu-sim_git-commit-$GIT_COMMIT-modified_$GIT_FILES_CHANGED"
echo -n "GPGPU-Sim version $GPGPUSIM_VERSION_STRING (build $GPGPUSIM_BUILD_STRING) ";