From d39d2ed9dd82992f55ece209f491e21728cd3175 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 27 Sep 2016 12:55:08 +0200 Subject: [PATCH] Roll calc_hash.sh into hash_version.sh (the only place that it's used) --- calc_hash.sh | 2 -- hash_version.sh | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 calc_hash.sh diff --git a/calc_hash.sh b/calc_hash.sh deleted file mode 100644 index e230e214d..000000000 --- a/calc_hash.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -git status > /dev/null 2>&1 && git rev-parse HEAD || echo NO_GIT_COMMIT_HASH_DEFINED diff --git a/hash_version.sh b/hash_version.sh index b014be5ac..3e82f1f04 100644 --- a/hash_version.sh +++ b/hash_version.sh @@ -1,6 +1,6 @@ #!/bin/bash -GIT_HASH=`sh ./calc_hash.sh`; +GIT_HASH=`git status > /dev/null 2>&1 && git rev-parse HEAD || echo NO_GIT_COMMIT_HASH_DEFINED`; rm -f ver sed -b "s/NO_GIT_COMMIT_HASH_DEFINED/$GIT_HASH$1/" renderdoc/data/resource.h > ver && mv ver renderdoc/data/resource.h