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 #55 from cqexbesd/expand_tilde

Browse source 
Expand ~ and $HOME when looking for files
This commit is contained in:
Duncan Ferguson 2016-03-12 08:31:22 +00:00
commit b0366e8469
1 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -114,8 +114,36 @@ sub _run_external_clusters {
return @results;
}
sub expand_filename {
my ( $self, $filename ) = @_;
my $home;
# try to determine the home directory
if (! defined($home = $ENV{'HOME'})) {
$home = (getpwuid($>))[5];
}
if (! defined($home)) {
$self->debug( 3, 'No home found so leaving filename ', $filename, ' unexpanded' );
return $filename;
}
$self->debug( 4, 'Using ', $home, ' as home directory' );
# expand ~ or $HOME
my $new_name = $filename;
$new_name =~ s!^~/!$home/!g;
$new_name =~ s!^\$HOME/!$home/!g;
$self->debug( 2, 'Expanding ', $filename, ' to ', $new_name )
unless ( $filename eq $new_name );
return $new_name;
}
sub read_tag_file {
my ( $self, $filename ) = @_;
$filename = $self->expand_filename( $filename );
$self->debug( 2, 'Reading tags from file ', $filename );
if ( -f $filename ) {
my %hosts
@ -133,6 +161,9 @@ sub read_tag_file {
sub read_cluster_file {
my ( $self, $filename ) = @_;
$filename = $self->expand_filename( $filename );
$self->debug( 2, 'Reading clusters from file ', $filename );
if ( -f $filename ) {