aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2018-05-18 13:33:58 +0200
committerFabian Groffen <grobian@gentoo.org>2018-05-18 13:33:58 +0200
commita6abfcfaa1ed4530e152b69ca5c46808c5e93d46 (patch)
tree112e9dc552ba6ae746a67c80fe14e8d981a0b6d1
parentman: regenerate for release (diff)
downloadportage-utils-a6abfcfaa1ed4530e152b69ca5c46808c5e93d46.tar.gz
portage-utils-a6abfcfaa1ed4530e152b69ca5c46808c5e93d46.tar.bz2
portage-utils-a6abfcfaa1ed4530e152b69ca5c46808c5e93d46.zip
version_barf: cleanup, add myself
-rw-r--r--main.c13
-rwxr-xr-xmake-tarball.sh4
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 "<unknown>"
+
+#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 <solar and vapier @ gentoo.org>\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 ..