diff options
author | Olivier Blin <oblin@mandriva.org> | 2005-06-08 06:18:14 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.org> | 2005-06-08 06:18:14 +0000 |
commit | a45bb69e7664f4e9d3f16a0d2f16b58e6ce9261a (patch) | |
tree | dfce117c86f3f1ab8e763dcea0e418ddde8b4d94 /perl-install/network/ndiswrapper.pm | |
parent | e54aca7071cd6027137da98828568b2069430e5d (diff) | |
download | drakx-a45bb69e7664f4e9d3f16a0d2f16b58e6ce9261a.tar drakx-a45bb69e7664f4e9d3f16a0d2f16b58e6ce9261a.tar.gz drakx-a45bb69e7664f4e9d3f16a0d2f16b58e6ce9261a.tar.bz2 drakx-a45bb69e7664f4e9d3f16a0d2f16b58e6ce9261a.tar.xz drakx-a45bb69e7664f4e9d3f16a0d2f16b58e6ce9261a.zip |
use prefix only once it has been defined by install
Diffstat (limited to 'perl-install/network/ndiswrapper.pm')
-rw-r--r-- | perl-install/network/ndiswrapper.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/network/ndiswrapper.pm b/perl-install/network/ndiswrapper.pm index bbcab8c7d..b56256c2a 100644 --- a/perl-install/network/ndiswrapper.pm +++ b/perl-install/network/ndiswrapper.pm @@ -5,16 +5,16 @@ use common; use modules; use detect_devices; -my $ndiswrapper_prefix = "$::prefix/etc/ndiswrapper"; +my $ndiswrapper_root = "/etc/ndiswrapper"; sub installed_drivers() { - grep { -d "$ndiswrapper_prefix/$_" } all($ndiswrapper_prefix); + grep { -d $::prefix . "$ndiswrapper_root/$_" } all($::prefix . $ndiswrapper_root); } sub present_devices { my ($driver) = @_; my @supported_devices; - foreach (all("$ndiswrapper_prefix/$driver")) { + foreach (all($::prefix . "$ndiswrapper_root/$driver")) { my ($ids) = /^([0-9A-Z]{4}:[0-9A-Z]{4})\.[05]\.conf$/; $ids and push @supported_devices, $ids; } @@ -35,7 +35,7 @@ sub ask_driver { $driver =~ s/\.inf$//; #- first uninstall the driver if present, may solve issues if it is corrupted - -d "$ndiswrapper_prefix/$driver" and system('ndiswrapper', '-e', $driver); + -d $::prefix . "$ndiswrapper_root/$driver" and system('ndiswrapper', '-e', $driver); unless (system('ndiswrapper', '-i', $inf_file) == 0) { $in->ask_warn(N("Error"), N("Unable to install the %s ndiswrapper driver!", $driver)); |