Cleaned up version awk script.

2 files changed, 16 insertions, 47 deletions

diff --git a/packages/NetWare/get_exp.awk b/packages/NetWare/get_exp.awk
index 5bd8a0cd8..5bd8a0cd8 100755..100644
--- a/packages/NetWare/get_exp.awk
+++ b/packages/NetWare/get_exp.awk
diff --git a/packages/NetWare/get_ver.awk b/packages/NetWare/get_ver.awk
index ddc03c523..79baf9e6d 100644
--- a/packages/NetWare/get_ver.awk
+++ b/packages/NetWare/get_ver.awk
@@ -19,57 +19,26 @@
 # * KIND, either express or implied.
 # *
 # ***************************************************************************
-# awk script which fetches curl / ares version number and string from input
+# awk script which fetches curl version number and copyright string from input
 # file and writes them to STDOUT. Here you can get an awk version for Win32:
 # http://www.gknw.net/development/prgtools/awk-20100523.zip
 #
 BEGIN {
-  if (match (ARGV[1], /curlver.h/)) {
-    while ((getline < ARGV[1]) > 0) {
-      if (match ($0, /^#define LIBCURL_COPYRIGHT "[^"]+"$/)) {
-        libcurl_copyright_str = substr($0, 28, length($0)-28);
-      }
-      else if (match ($0, /^#define LIBCURL_VERSION "[^"]+"$/)) {
-        libcurl_ver_str = substr($3, 2, length($3)-2);
-      }
-      else if (match ($0, /^#define LIBCURL_VERSION_MAJOR [0-9]+$/)) {
-        libcurl_ver_major = substr($3, 1, length($3));
-      }
-      else if (match ($0, /^#define LIBCURL_VERSION_MINOR [0-9]+$/)) {
-        libcurl_ver_minor = substr($3, 1, length($3));
-      }
-      else if (match ($0, /^#define LIBCURL_VERSION_PATCH [0-9]+$/)) {
-        libcurl_ver_patch = substr($3, 1, length($3));
-      }
-    }
-    libcurl_ver = libcurl_ver_major "," libcurl_ver_minor "," libcurl_ver_patch;
-    print "LIBCURL_VERSION = " libcurl_ver "";
-    print "LIBCURL_VERSION_STR = " libcurl_ver_str "";
-    print "LIBCURL_COPYRIGHT_STR = " libcurl_copyright_str "";
-  }
-  if (match (ARGV[1], /ares_version.h/)) {
-    while ((getline < ARGV[1]) > 0) {
-      if (match ($0, /^#define ARES_COPYRIGHT "[^"]+"$/)) {
-        libcares_copyright_str = substr($0, 25, length($0)-25);
-      }
-      else if (match ($0, /^#define ARES_VERSION_STR "[^"]+"$/)) {
-        libcares_ver_str = substr($3, 2, length($3)-2);
-      }
-      else if (match ($0, /^#define ARES_VERSION_MAJOR [0-9]+$/)) {
-        libcares_ver_major = substr($3, 1, length($3));
-      }
-      else if (match ($0, /^#define ARES_VERSION_MINOR [0-9]+$/)) {
-        libcares_ver_minor = substr($3, 1, length($3));
-      }
-      else if (match ($0, /^#define ARES_VERSION_PATCH [0-9]+$/)) {
-        libcares_ver_patch = substr($3, 1, length($3));
-      }
-    }
-    libcares_ver = libcares_ver_major "," libcares_ver_minor "," libcares_ver_patch;
-    print "LIBCARES_VERSION = " libcares_ver "";
-    print "LIBCARES_VERSION_STR = " libcares_ver_str "";
-    print "LIBCARES_COPYRIGHT_STR = " libcares_copyright_str "";
+  while ((getline < ARGV[1]) > 0) {
+    sub("\r", "") # make MSYS gawk work with CRLF header input.
+    if (match ($0, /^#define LIBCURL_COPYRIGHT "([^"]+)"$/))
+      copyright_string = substr($0, 28, length($0)-28)
+    else if (match ($0, /^#define LIBCURL_VERSION "[^"]+"$/))
+      version_string = substr($3, 2, length($3)-2)
+    else if (match ($0, /^#define LIBCURL_VERSION_MAJOR [0-9]+$/))
+      version_major = $3
+    else if (match ($0, /^#define LIBCURL_VERSION_MINOR [0-9]+$/))
+      version_minor = $3
+    else if (match ($0, /^#define LIBCURL_VERSION_PATCH [0-9]+$/))
+      version_patch = $3
   }
+  print "LIBCURL_VERSION = " version_major "," version_minor "," version_patch ""
+  print "LIBCURL_VERSION_STR = " version_string ""
+  print "LIBCURL_COPYRIGHT_STR = " copyright_string ""
 }
 
-