diff options
Diffstat (limited to 'perl-install/standalone/lsnetdrake')
| -rwxr-xr-x | perl-install/standalone/lsnetdrake | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/perl-install/standalone/lsnetdrake b/perl-install/standalone/lsnetdrake index 1b2885092..39d8d3337 100755 --- a/perl-install/standalone/lsnetdrake +++ b/perl-install/standalone/lsnetdrake @@ -1,8 +1,11 @@ #!/usr/bin/perl use lib qw(/usr/lib/libDrakX); -use network::smb; -use network::nfs; +use standalone; +use fs::remote::nfs; +use fs::remote::smb; +use MDK::Common::Func qw(if_); +#use interactive; # if we'd want lsnetdrake to install missing pkgs "@ARGV" =~ /-h/ and die "usage: lsnetdrake [-h] [--nfs] [--smb]\n"; @@ -12,21 +15,11 @@ my $smb = !@ARGV || "@ARGV" =~ /-(smb)/; $| = 1; $ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}"; -if ($nfs) { - my @servers = network::nfs::find_servers(); - foreach my $server (sort_names(@servers)) { - my $server_name = $server->{name} || $server->{ip}; - foreach (sort_names(network::nfs::find_exports($server))) { - print "$server_name:$_->{name}", $_->{comment} && " ($_->{comment})", "\n"; - } - } -} -if ($smb) { - my @servers = network::smb::find_servers(); - foreach my $server (sort_names(@servers)) { - my $server_name = $server->{name} || $server->{ip}; - foreach (sort_names(network::smb::find_exports($server))) { - print "//$server_name/$_->{name}", $_->{comment} && " ($_->{comment})", "\n"; +foreach my $class (if_($nfs, fs::remote::nfs->new), if_($smb, fs::remote::smb->new)) { + #$class->check(interactive->vnew) if -t *STDIN && -t *STDOUT; # Only if tty. TO DO IN INTERACTIVE-vnew instead?t + foreach my $server (sort_names(eval { $class->find_servers })) { + foreach (sort_names(eval { $class->find_exports($server) })) { + print $class->to_fullstring($_), "\n"; } } } |