amassivus/clusterssh
1
0
Fork 0
mirror of https://github.com/duncs/clusterssh.git synced 2025-07-03 01:43:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rework hostname expansion

Browse source 
Didn't like relying on the bash shell for expansions - instead recoded it to be pure-perl so it is more cross-platform.

Github issue #53
This commit is contained in:
Duncan Ferguson 2016-04-29 18:33:50 +01:00
parent 08d7fead03
commit 8b8a692b6c
8 changed files with 142 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/App/ClusterSSH/Cluster.pm
View file

@ -11,6 +11,7 @@ use Try::Tiny;
use English qw( -no_match_vars );
use base qw/ App::ClusterSSH::Base /;
use App::ClusterSSH::Range;
our $master_object_ref;
@ -220,23 +221,18 @@ sub expand_glob {
my ( $self, $type, $name, @items ) = @_;
my @expanded;
my $range = App::ClusterSSH::Range->new();
# skip expanding anything that appears to have nasty metachars
if ( !grep {m/[\`\!\$;]/} @items ) {
if ( grep {m/[{]/} @items ) {
#@expanded = split / /, `/bin/bash -c 'shopt -s extglob\n echo @items'`;
my $shell = $self->config->find_binary(
$self->parent->config->{shell} );
my $cmd
= $shell . q{ } . $self->parent->config->{shell_expansion};
$cmd =~ s/%items%/@items/;
@expanded = split / /, `$cmd`;
chomp(@expanded);
}
else {
@expanded = map { glob $_ } @items;
}
$self->debug( 4, "Non-expanded: @items" );
@items = $range->expand(@items);
# run glob over anything left incase there are numeric and textual ranges
@expanded = map { glob $_ } @items;
$self->debug( 4, "Final expansion: @expanded" );
}
else {
warn(