[PATCH] Make git_version_c.sh look more like gen_version_header.sh

[Joerg Mayer <jmayer () loplof de>]

> From 8f2edd03024ef226b7b579c2331f519c912d7f61 Mon Sep 17 00:00:00 2001
From: Joerg Mayer <jmayer () loplof de>
Date: Mon, 20 Mar 2017 21:06:34 +0100
Subject: [PATCH] Make git_version_c.sh look more like gen_version_header.sh

---
 gen_version_c.sh | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/gen_version_c.sh b/gen_version_c.sh
index d5a5e75..ae4ef9c 100755
--- a/gen_version_c.sh
+++ b/gen_version_c.sh
@@ -1,11 +1,22 @@
 #! /bin/sh
+print_version_string()
+{
+       if grep GIT "$1" >/dev/null
+       then
+               read ver <"$1"
+               echo $ver | tr -d '\012'
+               date +_%Y_%m_%d
+       else
+               cat "$1"
+       fi
+}
+if test $# != 2
+then
+       echo "Usage: gen_version_c.sh <version file> <output file>" 1>&2
+       exit 1
+fi
+version_string=`print_version_string "$1"`
 echo '#include <pcap/export-defs.h>' > "$2"
 echo 'PCAP_API_DEF' >> "$2"
-if grep GIT "$1" >/dev/null; then
-       read ver <"$1"
-       echo $ver | tr -d '\012'
-       date +_%Y_%m_%d
-else
-       cat "$1"
-fi | sed -e 's/.*/char pcap_version[] = "&";/' >> "$2"
+echo "$version_string" | sed -e 's/.*/char pcap_version[] = "&";/' >> "$2"
 
-- 
2.10.1 (Apple Git-78)

-- 
Joerg Mayer                                           <jmayer () loplof de>
We are stuck with technology when what we really want is just stuff that
works. Some say that should read Microsoft instead of technology.
_______________________________________________
tcpdump-workers mailing list
tcpdump-workers () lists tcpdump org
https://lists.sandelman.ca/mailman/listinfo/tcpdump-workers