pi-hole · jacobsalmela · Dec 7, 2017 · Sep 22, 2017 · Sep 22, 2017 · Sep 23, 2017
diff --git a/Makefile b/Makefile
@@ -13,6 +13,7 @@ OBJ = main.o structs.o log.o daemon.o parser.o signals.o socket.o request.o grep
 
 # Get git commit version and date
 GIT_BRANCH := $(shell git branch | sed -n 's/^\* //p')
+GIT_HASH := $(shell git --no-pager describe --always --dirty)
 GIT_VERSION := $(shell git --no-pager describe --tags --always --dirty)
 GIT_DATE := $(shell git --no-pager show --date=short --format="%ai" --name-only | head -n 1)
 GIT_TAG := $(shell git describe --tags --abbrev=0)
@@ -72,6 +73,7 @@ version.h: version~
 	@echo '#define GIT_DATE "$(GIT_DATE)"' >> "$@"
 	@echo '#define GIT_BRANCH "$(GIT_BRANCH)"' >> "$@"
 	@echo '#define GIT_TAG "$(GIT_TAG)"' >> "$@"
+	@echo '#define GIT_HASH "$(GIT_HASH)"' >> "$@"
 	@echo "Making FTL version on branch $(GIT_BRANCH) - $(GIT_VERSION) ($(GIT_DATE))"
 
 prefix=/usr

diff --git a/args.c b/args.c
@@ -55,7 +55,10 @@ void parse_args(int argc, char* argv[])
 
 		if(strcmp(argv[i], "version") == 0)
 		{
-			printf("%s\n",GIT_VERSION);
+			if(strcmp(GIT_BRANCH, "master") == 0)
+				printf("%s\n",GIT_VERSION);
+			else
+				printf("vDev-%s\n",GIT_HASH);
 			exit(EXIT_SUCCESS);
 		}
 

diff --git a/request.c b/request.c
@@ -1037,7 +1037,11 @@ void getQueryTypesOverTime(int *sock)
 void getVersion(int *sock)
 {
 	char server_message[SOCKETBUFFERLEN];
-	sprintf(server_message,"version %s\ntag %s\nbranch %s\ndate %s\n", GIT_VERSION, GIT_TAG, GIT_BRANCH, GIT_DATE);
+
+	if(strcmp(GIT_BRANCH, "master") == 0)
+		sprintf(server_message,"version %s\ntag %s\nbranch %s\ndate %s\n", GIT_VERSION, GIT_TAG, GIT_BRANCH, GIT_DATE);
+	else
+		sprintf(server_message,"version vDev-%s\ntag %s\nbranch %s\ndate %s\n", GIT_HASH, GIT_TAG, GIT_BRANCH, GIT_DATE);
 	swrite(server_message, *sock);
 
 	if(debugclients)