Browse Source

accept all options in rc file

Michael van Elst 23 years ago
parent
commit
c092f83791
1 changed files with 5 additions and 2 deletions
  1. 5 2
      openpkg-tool/openpkg-build.pl

+ 5 - 2
openpkg-tool/openpkg-build.pl

@@ -30,7 +30,8 @@ $|=1; # autoflush
 
 use strict;
 use vars qw/$opt_R $opt_r $opt_f $opt_u $opt_U $opt_a $opt_A $opt_z $opt_Z $opt_P $opt_N $opt_E $opt_i $opt_D $opt_p $opt_q $opt_s $opt_S $opt_X/;
-getopts('R:r:f:uUaAzZP:N:E:iD:p:qsSX');
+my $getopts = 'R:r:f:uUaAzZP:N:E:iD:p:qsSX';
+getopts($getopts);
 
 ##########################################################################
 
@@ -89,11 +90,13 @@ sub getopts ($) {
 my(%env) = ( '' => { } );
 if (open(FH, "< $ENV{'HOME'}/.openpkg/build")) {
     my($env) = $env{''};
+    my($go) = $getopts;
+    $go =~ s/[^a-zA-Z]//g;
     while (<FH>) {
         if (/^\s*\[([^\]]*)\]/) {
             $env{$1} = { } unless $env{$1};
             $env = $env{$1};
-        } elsif (my($opt,$val) = /^\-([RfruUaAzPN])\s*(.*?)\s*$/) {
+        } elsif (my($opt,$val) = /^\-([$go])\s*(.*?)\s*$/) {
             $val = 1 unless defined $val;
             $env->{$opt} = $val;
         }