# HG changeset patch # User Eric Joseph-Alexandre # Date 1229726975 -3600 # Node ID e7355177f438400efe2d7680cc7b9d1fda2304fa # Parent 840b64d8f45418ffde465b997c9cf368b74a853f tazndis: fix dirname error. diff -r 840b64d8f454 -r e7355177f438 tazndis/stuff/tazndis --- a/tazndis/stuff/tazndis Fri Dec 19 16:38:04 2008 +0000 +++ b/tazndis/stuff/tazndis Fri Dec 19 23:49:35 2008 +0100 @@ -26,7 +26,7 @@ #* #*/ -$ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}"; +$ENV{PATH} = "/sbin:/usr/sbin:/bin:/usr/bin"; my $WRAP_PCI_BUS = 5; my $WRAP_PCMCIA_BUS = 8; @@ -84,13 +84,13 @@ exit($res); sub usage() { - print "install/manage Windows drivers for ndiswrapper\n\n" . + print "install/manage Windows drivers for ndiswrapper kernel module\n\n" . "usage: tazndis OPTION\n" . "-i inffile install driver described by 'inffile'\n" . "-r driver remove 'driver'\n" . "-l list installed drivers\n" . "-v report version information\n\n" . - "If you need more complex operation, you may install ndiswrapper package instead.\n" ; + "If you need more complex operation, you may install full ndiswrapper package instead.\n" ; } #/* @@ -104,11 +104,6 @@ return $var; } -sub dirname { - local $var = $_[0]; - $var =~ s#(.*)/.*$#$1#; - return $var; -} # delete given single tree with no sub directories. sub rmtree { @@ -213,7 +208,7 @@ sub install { my $inf = shift; chomp($inf); - $src_dir = dirname($inf); + chop($src_dir = `dirname $inf`); $driver_name = lc(basename($inf)); unless ($driver_name =~ s/\.inf$//) { @@ -236,6 +231,9 @@ parse_mfr(); copy_file(basename($inf), basename($inf)); create_fuzzy_conf($driver_name); + print "Install done. " + ."You may add ndiswrapper in LOAD_MODULES to launch your network driver at boot time.\n"; + return 0; }