From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7227F1382C5 for ; Fri, 18 May 2018 12:19:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A84CAE0839; Fri, 18 May 2018 12:19:58 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 81162E090F for ; Fri, 18 May 2018 12:19:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 347EB335C77 for ; Fri, 18 May 2018 12:19:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C5BE2A1 for ; Fri, 18 May 2018 12:19:54 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1526643238.a6abfcfaa1ed4530e152b69ca5c46808c5e93d46.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: main.c make-tarball.sh X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: a6abfcfaa1ed4530e152b69ca5c46808c5e93d46 X-VCS-Branch: master Date: Fri, 18 May 2018 12:19:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b7127194-a5c4-493c-8771-aa35360ecc1c X-Archives-Hash: 7b096970ddd343c5f7365f5e57a89fca commit: a6abfcfaa1ed4530e152b69ca5c46808c5e93d46 Author: Fabian Groffen gentoo org> AuthorDate: Fri May 18 11:33:58 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri May 18 11:33:58 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=a6abfcfa version_barf: cleanup, add myself main.c | 13 ++++++++----- make-tarball.sh | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/main.c b/main.c index 9103dc4..7dbdbe7 100644 --- a/main.c +++ b/main.c @@ -189,21 +189,24 @@ usage(int status, const char *flags, struct option const opts[], static void version_barf(void) { + const char *vcsid = ""; const char *eprefixid = ""; #ifndef VERSION # define VERSION "git" #endif -#ifndef VCSID -# define VCSID "" + +#ifdef VCSID + vcsid = " (" VCSID ")"; #endif if (strlen(CONFIG_EPREFIX) > 1) eprefixid = "configured for " CONFIG_EPREFIX "\n"; - printf("portage-utils-%s: %s\n" + + printf("portage-utils-%s%s\n" "%s" - "%s written for Gentoo by \n", - VERSION, VCSID, eprefixid, argv0); + "written for Gentoo by solar, vapier and grobian\n", + VERSION, vcsid, eprefixid); exit(EXIT_SUCCESS); } diff --git a/make-tarball.sh b/make-tarball.sh index 4f8eed7..ce25579 100755 --- a/make-tarball.sh +++ b/make-tarball.sh @@ -36,8 +36,8 @@ git archive "${ver}" | tar xf - -C "${p}" cd "${p}" einfo "Building autotools ..." -sed -i "/^AC_INIT/s:git:${ver}:" configure.ac -sed -i "1iPV := ${ver}" Makefile +sed -i "/^AC_INIT/s:git:${ver#v}:" configure.ac +sed -i "1iPV := ${ver#v}" Makefile LC_ALL=C ${MAKE} -s autotools >/dev/null rm -rf autom4te.cache cd ..