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

Fix 'ctel', 'crsh' and 'ccon'

Browse source 
The code wasn't taking into account being called under another name correctly, so wasn't calling the correct comms method.
This commit is contained in:
Duncan Ferguson 2012-11-26 21:41:05 +00:00
parent 6eb3cdc2e4
commit 521b1fd37c
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Changes
View file

@ -1,6 +1,7 @@
????-??-?? Duncan Ferguson <duncan_ferguson@user.sf.net> - v4.01_02 ????-??-?? Duncan Ferguson <duncan_ferguson@user.sf.net> - v4.01_02
* Fix logic when using 'autoclose' on the command line or config file * Fix logic when using 'autoclose' on the command line or config file
* Fix $HOME/.clusterssh/clusters being read in * Fix $HOME/.clusterssh/clusters being read in
* Fix 'ctel', 'crsh' and 'ccon'so they work as expected
2011-12-09 Duncan Ferguson <duncan_ferguson@user.sf.net> - v4.01_01 2011-12-09 Duncan Ferguson <duncan_ferguson@user.sf.net> - v4.01_01
* Include missing files from release tarballs * Include missing files from release tarballs

11
lib/App/ClusterSSH/Config.pm
View file

@ -4,7 +4,7 @@ use strict;
use warnings; use warnings;
use version; use version;
our $VERSION = version->new('0.01'); our $VERSION = version->new('0.02');
use Carp; use Carp;
use Try::Tiny; use Try::Tiny;
@ -84,12 +84,17 @@ sub new {
my $self = $class->SUPER::new(%default_config); my $self = $class->SUPER::new(%default_config);
( my $comms = $Script ) =~ s/^c//; ( my $comms = $Script ) =~ s/^c//;
$self->{comms} = $comms;
$comms = 'telnet' if ( $comms eq 'tel' );
$comms = 'console' if ( $comms eq 'con' );
# list of allowed comms methods # list of allowed comms methods
if ( 'ssh rsh telnet console' !~ m/\B$comms\B/ ) { if ( 'ssh rsh telnet console' !~ m/\b$comms\b/ ) {
$self->{comms} = 'ssh'; $self->{comms} = 'ssh';
} }
else {
$self->{comms} = $comms;
}
if ( $self->{comms} if ( $self->{comms}
&& ( !$self->{ $self->{comms} } || !-e $self->{ $self->{comms} } ) ) && ( !$self->{ $self->{comms} } || !-e $self->{ $self->{comms} } ) )

7
lib/App/ClusterSSH/Helper.pm
View file

@ -4,7 +4,7 @@ use strict;
use warnings; use warnings;
use version; use version;
our $VERSION = version->new('0.01'); our $VERSION = version->new('0.02');
use Carp; use Carp;
use Try::Tiny; use Try::Tiny;
@ -119,7 +119,10 @@ sub script {
\$command .= "\$svr"; \$command .= "\$svr";
} }
} }
\$command .= " \\\"$command\\\" ; $postcommand"; if("$command") {
\$command .= " \\\"$command\\\"";
}
\$command .= " ; $postcommand";
warn("Running:\$command\\n"); # for debug purposes warn("Running:\$command\\n"); # for debug purposes
exec(\$command); exec(\$command);
HERE HERE