textual: use UTIL_LINUX_VERSION everywhere

Signed-off-by: Karel Zak <kzak@redhat.com>

21 files changed, 22 insertions, 47 deletions

diff --git a/disk-utils/blockdev.c b/disk-utils/blockdev.c
index eb347b79..4543818b 100644
--- a/disk-utils/blockdev.c
+++ b/disk-utils/blockdev.c
@@ -229,8 +229,7 @@ int main(int argc, char **argv)
 
 	/* -V not together with commands */
 	if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version")) {
-		printf(_("%s from %s\n"), program_invocation_short_name,
-		       PACKAGE_STRING);
+		printf(UTIL_LINUX_VERSION);
 		return EXIT_SUCCESS;
 	}
 	if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))
diff --git a/disk-utils/elvtune.c b/disk-utils/elvtune.c
index 6aa01a29..aa13c063 100644
--- a/disk-utils/elvtune.c
+++ b/disk-utils/elvtune.c
@@ -64,8 +64,7 @@ usage(void) {
 
 static void
 version(void) {
-	fprintf(stderr, _("%s from %s\n"),
-			program_invocation_short_name, PACKAGE_STRING);
+	fprintf(stderr, UTIL_LINUX_VERSION);
 }
 
 int
diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c
index e937a8ed..509a6055 100644
--- a/disk-utils/fdformat.c
+++ b/disk-utils/fdformat.c
@@ -128,8 +128,7 @@ int main(int argc, char **argv)
 			verify = 0;
 			break;
 		case 'V':
-			printf(_("%s from %s\n"), program_invocation_short_name,
-			       PACKAGE_STRING);
+			printf(UTIL_LINUX_VERSION);
 			exit(EXIT_SUCCESS);
 		case 'h':
 			usage(stdout);
diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index 28a1d706..16746ab1 100644
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -1504,7 +1504,7 @@ int main(int argc, char *argv[])
 	parse_argv(argc, argv);
 
 	if (!notitle)
-		printf(_("%s from %s\n"), program_invocation_short_name, PACKAGE_STRING);
+		printf(UTIL_LINUX_VERSION);
 
 	load_fs_info();
 
diff --git a/disk-utils/mkfs.bfs.c b/disk-utils/mkfs.bfs.c
index d83f9e08..0a296f32 100644
--- a/disk-utils/mkfs.bfs.c
+++ b/disk-utils/mkfs.bfs.c
@@ -86,7 +86,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
 
 static void __attribute__ ((__noreturn__)) print_version(void)
 {
-	printf(_("%s from %s\n"), program_invocation_short_name, PACKAGE_STRING);
+	printf(UTIL_LINUX_VERSION);
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/disk-utils/mkfs.c b/disk-utils/mkfs.c
index 1929a907..55506c05 100644
--- a/disk-utils/mkfs.c
+++ b/disk-utils/mkfs.c
@@ -57,8 +57,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
 
 static void __attribute__ ((__noreturn__)) print_version(void)
 {
-	printf(_("%s from %s\n"),
-	       program_invocation_short_name, PACKAGE_STRING);
+	printf(UTIL_LINUX_VERSION);
 	exit(EXIT_SUCCESS);
 }
 
@@ -128,8 +127,7 @@ int main(int argc, char **argv)
 	argv[--optind] = progname;
 
 	if (verbose) {
-		printf(_("%s from %s\n"),
-		       program_invocation_short_name, PACKAGE_STRING);
+		printf(UTIL_LINUX_VERSION);
 		i = optind;
 		while (argv[i])
 			printf("%s ", argv[i++]);
diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index f504a323..8abc0455 100644
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -760,8 +760,7 @@ int main(int argc, char **argv)
 			/* old option, ignored */
 			break;
 		case 'V':
-			printf(_("%s from %s\n"),
-			       program_invocation_short_name, PACKAGE_STRING);
+			printf(UTIL_LINUX_VERSION);
 			exit(MKFS_EX_OK);
 		case 'v':
 			verbose = 1;
diff --git a/fdisks/sfdisk.c b/fdisks/sfdisk.c
index e59d52a2..d98df9a9 100644
--- a/fdisks/sfdisk.c
+++ b/fdisks/sfdisk.c
@@ -2623,8 +2623,7 @@ main(int argc, char **argv) {
 	    set_format(*optarg);
 	    break;
 	case 'v':
-	    printf(_("%s from %s\n"), program_invocation_short_name,
-		   PACKAGE_STRING);
+	    printf(UTIL_LINUX_VERSION);
 	    return EXIT_SUCCESS;
 	case 'h':
 	    usage(stdout);
diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index 0e204b99..3a82c81a 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -350,8 +350,7 @@ main(int argc, char **argv) {
 			yflag = 1;
 			break;
 		case 'V':
-			printf(_("%s from %s\n"), program_invocation_short_name,
-			       PACKAGE_STRING);
+			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		case 'h':
 			usage(stdout);
diff --git a/misc-utils/getopt.c b/misc-utils/getopt.c
index 8de469b1..9e94452e 100644
--- a/misc-utils/getopt.c
+++ b/misc-utils/getopt.c
@@ -428,9 +428,7 @@ int main(int argc, char *argv[])
 			quote = 0;
 			break;
 		case 'V':
-			printf(_("%s from %s\n"),
-			       program_invocation_short_name,
-			       PACKAGE_STRING);
+			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		case '?':
 		case ':':
diff --git a/misc-utils/kill.c b/misc-utils/kill.c
index 6abfd24a..8c06a456 100644
--- a/misc-utils/kill.c
+++ b/misc-utils/kill.c
@@ -190,7 +190,7 @@ int main (int argc, char *argv[])
 	}
 	if (! strcmp (arg, "-v") || ! strcmp (arg, "-V") ||
 	    ! strcmp (arg, "--version")) {
-	    printf(_("%s from %s\n"), progname, PACKAGE_STRING);
+	    printf(UTIL_LINUX_VERSION);
 	    return 0;
 	}
 	if (! strcmp (arg, "-a")) {
diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index ecdbfe37..63cd3559 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -261,8 +261,7 @@ main(int argc, char **argv) {
 			udpport = optarg;
 			break;
 		case 'V':
-			printf(_("%s from %s\n"), program_invocation_short_name,
-						  PACKAGE_STRING);
+			printf(UTIL_LINUX_VERSION);
 			exit(EXIT_SUCCESS);
 		case 'h':
 			usage(stdout);
diff --git a/misc-utils/look.c b/misc-utils/look.c
index 7bbec1b2..83a4ee9c 100644
--- a/misc-utils/look.c
+++ b/misc-utils/look.c
@@ -123,9 +123,7 @@ main(int argc, char *argv[])
 			termchar = *optarg;
 			break;
 		case 'V':
-			printf(_("%s from %s\n"),
-				program_invocation_short_name,
-				PACKAGE_STRING);
+			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		case 'h':
 			usage(stdout);
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 8ee69748..26d7f505 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -1506,8 +1506,7 @@ int main(int argc, char *argv[])
 			columns[ncolumns++] = COL_TRANSPORT;
 			break;
 		case 'V':
-			printf(_("%s from %s\n"), program_invocation_short_name,
-				PACKAGE_STRING);
+			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
 			help(stderr);
diff --git a/misc-utils/mcookie.c b/misc-utils/mcookie.c
index b7b1762d..e9fdfd1a 100644
--- a/misc-utils/mcookie.c
+++ b/misc-utils/mcookie.c
@@ -116,9 +116,7 @@ int main(int argc, char **argv)
 			file = optarg;
 			break;
 		case 'V':
-			printf(_("%s from %s\n"),
-			       program_invocation_short_name,
-			       PACKAGE_STRING);
+			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		case 'h':
 			usage(stdout);
diff --git a/misc-utils/namei.c b/misc-utils/namei.c
index 97c5d43d..048ac42b 100644
--- a/misc-utils/namei.c
+++ b/misc-utils/namei.c
@@ -463,8 +463,7 @@ main(int argc, char **argv)
 			usage(EXIT_SUCCESS);
 			break;
 		case 'V':
-			printf(_("%s from %s\n"), program_invocation_short_name,
-						  PACKAGE_STRING);
+			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		case 'l':
 			flags |= (NAMEI_OWNERS | NAMEI_MODES | NAMEI_VERTICAL);
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index 3dde49e1..668aac7a 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -577,9 +577,7 @@ int main(int argc, char **argv)
 			}
 			break;
 		case 'V':
-			printf(_("%s from %s\n"),
-			       program_invocation_short_name,
-			       PACKAGE_STRING);
+			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		case 'h':
 			usage(stdout);
diff --git a/misc-utils/uuidgen.c b/misc-utils/uuidgen.c
index 6c22fce6..450e26a0 100644
--- a/misc-utils/uuidgen.c
+++ b/misc-utils/uuidgen.c
@@ -74,9 +74,7 @@ main (int argc, char *argv[])
 			do_type = DO_TYPE_RANDOM;
 			break;
 		case 'V':
-			printf(_("%s from %s\n"),
-				program_invocation_short_name,
-				PACKAGE_STRING);
+			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		case 'h':
 			usage(stdout);
diff --git a/misc-utils/whereis.c b/misc-utils/whereis.c
index 095ca628..3528d626 100644
--- a/misc-utils/whereis.c
+++ b/misc-utils/whereis.c
@@ -464,9 +464,7 @@ main(int argc, char **argv)
 				mflag++;
 				continue;
 			case 'V':
-				printf(_("%s from %s\n"),
-					program_invocation_short_name,
-					PACKAGE_STRING);
+				printf(UTIL_LINUX_VERSION);
 				return EXIT_SUCCESS;
 			case 'h':
 				usage(stdout);
diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index a29f3ccf..9fbfda99 100644
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -445,8 +445,7 @@ main(int argc, char **argv)
 			type_pattern = optarg;
 			break;
 		case 'V':
-			printf(_("%s from %s\n"), program_invocation_short_name,
-				PACKAGE_STRING);
+			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
 		default:
 			usage(stderr);
diff --git a/mount-deprecated/umount.c b/mount-deprecated/umount.c
index da3b05b8..97a76811 100644
--- a/mount-deprecated/umount.c
+++ b/mount-deprecated/umount.c
@@ -811,8 +811,7 @@ main (int argc, char *argv[]) {
 			++verbose;
 			break;
 		case 'V':		/* version */
-			printf(_("%s from %s\n"),
-			       program_invocation_short_name, PACKAGE_STRING);
+			printf(UTIL_LINUX_VERSION);
 			exit (0);
 		case 't':		/* specify file system type */
 			types = optarg;