diff options
| -rw-r--r-- | perl-install/Makefile | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/drakautoinst | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/drakfont | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/drakgw | 10 | ||||
| -rwxr-xr-x | perl-install/standalone/scannerdrake | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index d8b9d4d65..59bbb222a 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -48,7 +48,7 @@ test_pms: perl_checker install2.pm install_steps_gtk.pm install_steps_stdio.pm partition_table/*.pm standalone/{harddrake2,diskdrake,draksec} test_pms_all: - perl_checker --check-unused $(wildcard $(ALLPMS)) + perl_checker $(shell echo $(ALLPMS) | perl -pe 's!(printer|share/advertising)\S+!!g') %.mo: %.po msgfmt -o $@ $< diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst index 6364228f7..3304c3dc2 100755 --- a/perl-install/standalone/drakautoinst +++ b/perl-install/standalone/drakautoinst @@ -80,7 +80,7 @@ do { common::sync(); }; $again = $@; #- grrr... $@ is localized in code block :-( -} while ($again); +} while $again; fs::mount($dev, $mountdir, 'vfat', 0); my $cfgfile = "$mountdir/auto_inst.cfg"; eval(cat_($cfgfile)); diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index 5f3dffa5c..3dd3010c6 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -325,7 +325,7 @@ sub convert_ttf_fonts { sub move_fonts { my ($src_dir, $dest_dir, @extensions) = @_; - my @fonts = map { s@.*/@@; $_ } map { glob("$src_dir/*.$_") } @extensions; + my @fonts = map { s!.*/!!; $_ } map { glob("$src_dir/*.$_") } @extensions; system("cd $src_dir && mv @fonts $dest_dir") if @fonts; } diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw index 3270f45d3..667f8870f 100755 --- a/perl-install/standalone/drakgw +++ b/perl-install/standalone/drakgw @@ -51,7 +51,7 @@ my $masq_file = "/etc/shorewall/masq"; my $dhcpd_conf = "/etc/dhcpd.conf"; my $cups_conf = "/etc/cups/cupsd.conf"; -my $shorewall = network::shorewall::read($in,'silent'); +my $shorewall = network::shorewall::read($in, 'silent'); my $in = 'interactive'->vnew('su'); $::Wizard_title = N("Internet Connection Sharing"); @@ -120,7 +120,7 @@ begin: #- ********************************** #- * 0th step: verify if we are already set up -if ($shorewall && (-f "/etc/shorewall/masq")) { +if ($shorewall && -f "/etc/shorewall/masq") { $::Wizard_no_previous = 1; if (!$shorewall->{disabled}) { @@ -136,7 +136,7 @@ What would you like to do?"), stop_daemons(); } foreach ($dhcpd_conf, $masq_file) { - if ( -f $_ ) { rename($_, "$_.drakgwdisable") or die "Could not rename $_ to $_.drakgwdisable"}; + if (-f $_) { rename($_, "$_.drakgwdisable") or die "Could not rename $_ to $_.drakgwdisable" }; } sys("/etc/init.d/shorewall restart >/dev/null"); log::l("[drakgw] Disabled"); @@ -280,8 +280,8 @@ Do you want an automatic re-configuration? You can do it manually but you need to know what you're doing.", $device), [ { label => N("Automatic reconfiguration"), val => \$auto, list => [ N("Yes"), N("No (experts only)") ] }, { val => N("Show current interface configuration"), clicked => - sub { $in-> ask_okcancel(N("Current interface configuration"), - N("Current configuration of `%s': + sub { $in->ask_okcancel(N("Current interface configuration"), + N("Current configuration of `%s': Network: %s IP address: %s diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake index 6f3a1b0e7..3cdf44302 100755 --- a/perl-install/standalone/scannerdrake +++ b/perl-install/standalone/scannerdrake @@ -32,7 +32,7 @@ foreach (@ARGV) { /^--update-usbtable$/ and do { scanner::updateScannerDBfromUsbtable(); exit() }; /^--update-sane=(.*)$/ and do { scanner::updateScannerDBfromSane($1); exit() }; /^--manual$/ and $::Manual=1; - /^--dynamic=(.*)$/ and do { dynamic($1); exit() }; + /^--dynamic=(.*)$/ and do { dynamic(); exit() }; } my $in = 'interactive'->vnew('su'); |