[gnurl] branch master updated: maketgz: OSS'ificate for now

[gnunet]

This is an automated email from the git hooks/post-receive script.

nikita pushed a commit to branch master
in repository gnurl.

The following commit(s) were added to refs/heads/master by this push:
     new c8473413d maketgz: OSS'ificate for now
c8473413d is described below

commit c8473413d9e34d8d5155cf19b0c8545d15316bec
Author: nikita <address@hidden>
AuthorDate: Thu Apr 30 17:47:18 2020 +0200

    maketgz: OSS'ificate for now
---
 .travis.yml |  1 -
 maketgz     | 27 ++++++++++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3d1a125d0..ee1f710be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -255,7 +255,6 @@ matrix:
 before_install:
   - export "${OVERRIDE_CC-blank=}"
   - export "${OVERRIDE_CXX-blank=}"
-  - export gmake=make
 
 install:
   - if [ "$T" = "coverage" ]; then pip2 install --user cpp-coveralls; fi
diff --git a/maketgz b/maketgz
index d463e497d..cafd4f7e9 100755
--- a/maketgz
+++ b/maketgz
@@ -154,7 +154,11 @@ tardir="gnurl-$version"
 # MAKE=gmake is required.
 # gmake -sj1 dist VERSION=$version
 # make -sj1 dist VERSION=$version
-gmake dist VERSION=$version
+if test `uname` = Linux; then
+    make dist VERSION=$version
+else
+    gmake dist VERSION=$version
+fi
 
 # Now make an Z archive from the tar.gz original
 
@@ -218,13 +222,18 @@ echo "maketgz report:"
 echo ""
 ls -l $targz $compressfile $paxz
 
-echo "Signing the files..."
-gpg2 -b -a $targz && gpg2 -b -a $compressfile && gpg2 -b -a $paxz
 # The lines below assume that you are me,
 # in other words you do this on a NetBSD system.
-rm -f gnurl-$version.sum.txt
-sha1 $targz $compressfile $paxz >> gnurl-$version.sum.txt
-sum -a SHA512 $targz $compressfile $paxz >> gnurl-$version.sum.txt
-rmd160 $targz $compressfile $paxz >> gnurl-$version.sum.txt
-echo "Signing the sum file..."
-gpg2 -b -a gnurl-$version.sum.txt
+# TODO: Adjust to work on Linux and NetBSD (sum, etc)
+echo "Signing the files..."
+if type "gpg2" >/dev/null 2>&1; then
+    if test `uname` = "NetBSD"; then
+        gpg2 -b -a $targz && gpg2 -b -a $compressfile && gpg2 -b -a $paxz
+        rm -f gnurl-$version.sum.txt
+        sha1 $targz $compressfile $paxz >> gnurl-$version.sum.txt
+        sum -a SHA512 $targz $compressfile $paxz >> gnurl-$version.sum.txt
+        rmd160 $targz $compressfile $paxz >> gnurl-$version.sum.txt
+        echo "Signing the sum file..."
+        gpg2 -b -a gnurl-$version.sum.txt
+    fi
+fi

-- 
To stop receiving notification emails like this one, please contact
address@hidden.