josch/multistrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Do not retrieve and print version

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2016-12-24 13:38:08 +01:00
parent 2bd1bd4eee
commit cb3d6d4655
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
multistrap
View file

@ -41,7 +41,6 @@ sub main {
setlocale(LC_MESSAGES, ""); setlocale(LC_MESSAGES, "");
textdomain("multistrap"); textdomain("multistrap");
my $progname = basename($0); my $progname = basename($0);
my $ourversion = &our_version();
$default_release = "*"; $default_release = "*";
$unpack = "true"; $unpack = "true";
%omitdebsrc=(); %omitdebsrc=();
@ -96,8 +95,8 @@ sub main {
my $cfgdir=dirname($file); my $cfgdir=dirname($file);
cascade($file); cascade($file);
# Translators: fields are programname, version string, include file. # Translators: fields are programname, include file.
printf (_g("%s %s using %s\n"), $progname, $ourversion, $file); printf (_g("%s using %s\n"), $progname, $file);
$host = `dpkg --print-architecture`; $host = `dpkg --print-architecture`;
chomp($host); chomp($host);
foreach my $inc (@includes) { foreach my $inc (@includes) {
@ -124,8 +123,8 @@ sub main {
&dump_config; &dump_config;
exit 0; exit 0;
} }
# Translators: fields are: programname, versionstring, configfile. # Translators: fields are: programname, configfile.
printf (_g("%s %s using %s\n"), $progname, $ourversion, $file); printf (_g("%s using %s\n"), $progname, $file);
if ((not defined $arch) or ($arch eq "")) { if ((not defined $arch) or ($arch eq "")) {
$arch = $host; $arch = $host;
printf (_g("Defaulting architecture to native: %s\n"),$arch); printf (_g("Defaulting architecture to native: %s\n"),$arch);
@ -1077,10 +1076,7 @@ sub prepare_sources_list {
sub usageversion { sub usageversion {
my $progname = basename($0); my $progname = basename($0);
my $ourversion = &our_version();
printf STDERR (_g(" printf STDERR (_g("
%s version %s
Usage: Usage:
%s [-a ARCH] [-d DIR] -f CONFIG_FILE %s [-a ARCH] [-d DIR] -f CONFIG_FILE
%s -?|-h|--help|--version %s -?|-h|--help|--version
@ -1146,7 +1142,7 @@ General settings:
'directory' specifies the top level directory where the bootstrap 'directory' specifies the top level directory where the bootstrap
will be created - it is not packed into a .tgz once complete. will be created - it is not packed into a .tgz once complete.
"), $progname, $ourversion, $progname, $progname, $progname) "), $progname, $progname, $progname)
or die ("$progname: ". _g("failed to write usage:") . "$!\n"); or die ("$progname: ". _g("failed to write usage:") . "$!\n");
} }
@ -1325,6 +1321,13 @@ sub cascade {
uniq_sort (\@extrapkgs); uniq_sort (\@extrapkgs);
} }
# returns zero on success, non-zero on fail
sub check_multiarch_dpkg {
my $retval = system ("dpkg --print-foreign-architectures > /dev/null 2>&1");
$retval >>=8;
return $retval;
}
sub system_fatal { sub system_fatal {
my $cmd = shift; my $cmd = shift;
my $retval = system ("$cmd"); my $retval = system ("$cmd");