Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f0c5413 authored by Bill Pemberton's avatar Bill Pemberton Committed by Steven Rostedt
Browse files

localmodconfig: Rework find_config in streamline_config.pl



Change find_config function to read_config.  It now finds the config,
reads the config into an array, and returns the array.  This makes it
a little cleaner and changes the open to use perl's 3 option open.

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 224a2571
Loading
Loading
Loading
Loading
+6 −8
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ my @searchconfigs = (
	},
);

sub find_config {
sub read_config {
    foreach my $conf (@searchconfigs) {
	my $file = $conf->{"file"};

@@ -115,17 +115,15 @@ sub find_config {

	print STDERR "using config: '$file'\n";

	open(CIN, "$exec $file |") || die "Failed to run $exec $file";
	return;
	open(my $infile, '-|', "$exec $file") || die "Failed to run $exec $file";
	my @x = <$infile>;
	close $infile;
	return @x;
    }
    die "No config file found";
}

find_config;

# Read in the entire config file into config_file
my @config_file = <CIN>;
close CIN;
my @config_file = read_config;

# Parse options
my $localmodconfig = 0;