Changeset 1127 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Base.pm

Timestamp:

Dec 21, 2010, 2:37:35 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Modify pb_check_req interface to return the found value and allow direct call
• Use pb_check_req to avoid some hardcoded path

File:

• devel/pb-modules/lib/ProjectBuilder/Base.pm (modified) (3 diffs)

devel/pb-modules/lib/ProjectBuilder/Base.pm

@@ -37 +37 @@
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_mkdir_p pb_system pb_rm_rf pb_get_date pb_log pb_log_init pb_get_uri pb_get_content pb_set_content pb_display_file pb_syntax_init pb_syntax pb_temp_init pb_get_arch pb_check_requirements $pbdebug $pbLOG $pbdisplaytype $pblocale);
+our @EXPORT = qw(pb_mkdir_p pb_system pb_rm_rf pb_get_date pb_log pb_log_init pb_get_uri pb_get_content pb_set_content pb_display_file pb_syntax_init pb_syntax pb_temp_init pb_get_arch pb_check_requirements pb_check_req $pbdebug $pbLOG $pbdisplaytype $pblocale);
 
 =pod
@@ -423 +423 @@
 }
 
+=item B<pb_check_req>
+
+This function checks existence of a command and return its full pathname.
+The command name is passed as first parameter.
+The second parameter should be 0 if the command is mandatory, 1 if optional.
+
+=cut
+
 sub pb_check_req {
 
 my $file = shift;
 my $opt = shift || 1;
-my $found = 0;
+my $found = undef;
 
 pb_log(2,"Checking availability of $file...");
 # Check for all dirs in the PATH
 foreach my $p (split(/:/,$ENV{'PATH'})) {
-    $found = 1 if (-x "$p/$file");
-}
-if ($found eq 0) {
+    if (-x "$p/$file") {
+        $found =  "$p/$file";
+        last;
+    }
+}
+
+if (not $found) {
     pb_log(2,"KO\n");
     if ($opt eq 1) {
@@ -443 +455 @@
 } else {
     pb_log(2,"OK\n");
+    return($found");
 }
 }