From 9144dd207b745f9a1b5d8a054ee9edf20bf5bac3 Mon Sep 17 00:00:00 2001
From: "Zane C. Bowers-Hadley" <vvelox@vvelox.net>
Date: Mon, 13 Apr 2020 04:18:02 -0500
Subject: [PATCH] cbsd bls works now :)

---
 Rex-Virtualization-CBSD/Makefile.PL               |  2 +-
 .../lib/Rex/Virtualization/CBSD/list.pm           | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Rex-Virtualization-CBSD/Makefile.PL b/Rex-Virtualization-CBSD/Makefile.PL
index 1da8ebc..4417c76 100644
--- a/Rex-Virtualization-CBSD/Makefile.PL
+++ b/Rex-Virtualization-CBSD/Makefile.PL
@@ -18,7 +18,7 @@ my %WriteMakefileArgs = (
     },
     PREREQ_PM => {
 		'Term::ANSIColor'=>'0',
-		'Rex'=>'1.9.0';
+		'Rex'=>'1.9.0',
     },
     dist  => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
     clean => { FILES => 'Rex-Virtualization-CBSD-*' },
diff --git a/Rex-Virtualization-CBSD/lib/Rex/Virtualization/CBSD/list.pm b/Rex-Virtualization-CBSD/lib/Rex/Virtualization/CBSD/list.pm
index 43bf754..c5f4a35 100644
--- a/Rex-Virtualization-CBSD/lib/Rex/Virtualization/CBSD/list.pm
+++ b/Rex-Virtualization-CBSD/lib/Rex/Virtualization/CBSD/list.pm
@@ -11,31 +11,30 @@ our $VERSION = '1.9.0'; # VERSION
 
 use Rex::Logger;
 use Rex::Helper::Run;
-use Term::ANSIColor;
+use Term::ANSIColor qw(colorstrip);
 
 sub execute {
 	my ( $class, $arg1 ) = @_;
 
-	Rex::Logger::debug("Getting CBSD VM list via display=nodename,jname,jid,vm_ram,vm_curmem,vm_cpus,pcpu,vm_os_type,ip4_addr,status,vnc,path");
+	Rex::Logger::debug("Getting CBSD VM list via cbsd bls display=nodename,jname,jid,vm_ram,vm_curmem,vm_cpus,pcpu,vm_os_type,ip4_addr,status,vnc,path");
 
 	my %VMs;
 
-	my $found=i_run('display=nodename,jname,jid,vm_ram,vm_curmem,vm_cpus,pcpu,vm_os_type,ip4_addr,status,vnc,path'),
-	fail_ok => 1;
+	my $found=i_run ('cbsd bls display=nodename,jname,jid,vm_ram,vm_curmem,vm_cpus,pcpu,vm_os_type,ip4_addr,status,vnc,path' , fail_ok => 1);
 	if ( $? != 0 ) {
-		die("Error running 'display=nodename,jname,jid,vm_ram,vm_curmem,vm_cpus,pcpu,vm_os_type,ip4_addr,status,vnc,path'");
+		die("Error running 'cbsd bls display=nodename,jname,jid,vm_ram,vm_curmem,vm_cpus,pcpu,vm_os_type,ip4_addr,status,vnc,path'");
 	}
 
 	$found=colorstrip($found);
 
 	my @found_lines=split(/\n/, $found);
 
-	foreach my $line (@found_lines){
+	foreach my $line (@found_lines) {
 		my %VM;
 		( $VM{'node'}, $VM{'name'}, $VM{'pid'}, $VM{'ram'}, $VM{'curmem'},
 			$VM{'cpus'}, $VM{'pcpu'}, $VM{'os'}, $VM{'ip4'}, $VM{'status'},
-			$VM{'vnc'}, $VM{'path'} ) = split(/[\ \t]/, $line;
-		$VMs{$VM{'name'}=\%VM;
+			$VM{'vnc'}, $VM{'path'} ) = split(/[\ \t]+/, $line);
+		$VMs{$VM{'name'}}=\%VM;
 	}
 
 	return \%VMs;