amassivus/clusterssh
1
0
Fork 0
mirror of https://github.com/duncs/clusterssh.git synced 2025-04-22 09:22:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #57 from cqexbesd/fixups

Browse source 
Fixups for last PR
This commit is contained in:
Duncan Ferguson 2016-03-16 19:12:30 +00:00
commit dd95e94e7f
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -119,11 +119,12 @@ sub expand_filename {
my $home;
# try to determine the home directory
if (! defined($home = $ENV{'HOME'})) {
$home = (getpwuid($>))[5];
if ( !defined( $home = $ENV{'HOME'} ) ) {
$home = ( getpwuid($>) )[5];
}
if (! defined($home)) {
$self->debug( 3, 'No home found so leaving filename ', $filename, ' unexpanded' );
if ( !defined($home) ) {
$self->debug( 3, 'No home found so leaving filename ',
$filename, ' unexpanded' );
return $filename;
}
$self->debug( 4, 'Using ', $home, ' as home directory' );
@ -142,7 +143,7 @@ sub expand_filename {
sub read_tag_file {
my ( $self, $filename ) = @_;
$filename = $self->expand_filename( $filename );
$filename = $self->expand_filename($filename);
$self->debug( 2, 'Reading tags from file ', $filename );
if ( -f $filename ) {
@ -162,7 +163,7 @@ sub read_tag_file {
sub read_cluster_file {
my ( $self, $filename ) = @_;
$filename = $self->expand_filename( $filename );
$filename = $self->expand_filename($filename);
$self->debug( 2, 'Reading clusters from file ', $filename );
@ -329,6 +330,10 @@ file name and register the tags found.
Read in the given cluster file and register the tags found
=item $cluster->expand_filename($filename);
Expand ~ or $HOME in a filename
=item $cluster->read_tag_file($filename);
Read in the given tag file and register the tags found