From 274e45e365a484ba0b3a957ead8c420484d6fca9 Mon Sep 17 00:00:00 2001 From: antirez Date: Tue, 18 May 2010 12:17:51 +0200 Subject: [PATCH] build fixed when simpler shells are used to create release.h --- mkreleasehdr.sh | 4 ++-- redis.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mkreleasehdr.sh b/mkreleasehdr.sh index b2369c75..ea3b35a5 100755 --- a/mkreleasehdr.sh +++ b/mkreleasehdr.sh @@ -1,9 +1,9 @@ #!/bin/sh -GIT_SHA1=$((git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1) +GIT_SHA1=$(git show-ref --head --hash=8 2> /dev/null | head -n1) GIT_DIRTY=$(git diff 2> /dev/null | wc -l) test -f release.h || touch release.h (cat release.h | grep SHA1 | grep $GIT_SHA1) && \ (cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already uptodate echo "#define REDIS_GIT_SHA1 \"$GIT_SHA1\"" > release.h -echo "#define REDIS_GIT_DIRTY $GIT_DIRTY" >> release.h +echo "#define REDIS_GIT_DIRTY \"$GIT_DIRTY\"" >> release.h touch redis.c # force recompile of redis.c diff --git a/redis.c b/redis.c index 8ace1898..48700cdb 100644 --- a/redis.c +++ b/redis.c @@ -7203,7 +7203,7 @@ static sds genRedisInfoString(void) { "role:%s\r\n" ,REDIS_VERSION, REDIS_GIT_SHA1, - REDIS_GIT_DIRTY > 0, + strtol(REDIS_GIT_DIRTY,NULL,10) > 0, (sizeof(long) == 8) ? "64" : "32", aeGetApiName(), (long) getpid(), -- 2.47.2