Changeset 974 in ProjectBuilder for devel/pb/bin/pb

Timestamp:

Feb 19, 2010, 4:17:46 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Adds function pb_check_requirements and use it in pb
• Adds some conf params for rpmbootstrap in conf file
• pb_distro_get_param now can expand some variables before returning a value

File:

• devel/pb/bin/pb (modified) (4 diffs)

devel/pb/bin/pb

@@ -341 +341 @@
 
 my ($projectbuilderver,$projectbuilderrev) = pb_version_init();
+my $appname = "pb";
 
 # Initialize the syntax string
 
-pb_syntax_init("pb (aka project-builder.org) Version $projectbuilderver-$projectbuilderrev\n");
+pb_syntax_init("$appname (aka project-builder.org) Version $projectbuilderver-$projectbuilderrev\n");
 
 GetOptions("help|?|h" => \$opts{'h'}, 
@@ -417 +418 @@
 $action = shift @ARGV;
 die pb_syntax(-1,1) if (not defined $action);
+
+#
+# Check for command requirements
+#
+my ($req,$opt) = pb_conf_get_if("oscmd","oscmdopt");
+pb_check_requirements($req->{$appname},$opt->{$appname});
 
 my ($filteredfiles, $supfiles, $defpkgdir, $extpkgdir);
@@ -1790 +1797 @@
 
                         pb_system("sudo /usr/sbin/rinse --directory \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\" --arch \"$darch\" --distribution \"$ddir-$dver\" --config \"$veconf->{$ENV{'PBPROJ'}}\" $b4post $post $addpkgs $rinseverb","Creating the rinse VE for $ddir-$dver ($darch)", "verbose");
+                    } elsif ($verpmstyle eq "rpmbootstrap") {
+                        my $rbsverb = "";
+                        $rbsverb = "--verbose" if ($pbdebug gt 0);
+                        pb_system("sudo /usr/bin/rpmbootstrap $ddir-$dver-$darch $rbsverb","Creating the rpmboostrap VE for $ddir-$dver ($darch)", "verbose");
                     } elsif ($verpmstyle eq "mock") {
                         pb_system("sudo /usr/sbin/mock --init --resultdir=\"/tmp\" --configdir=\"$veconf->{$ENV{'PBPROJ'}}\" -r $v","Creating the mock VE for $ddir-$dver ($darch)");
@@ -2684 +2695 @@
 
     # Allow for modification
-    pb_system("vi $ENV{'PBTMP'}/announce.html","Allowing modification of the announce","noredir");
+    my $editor = "vi";
+    $editor = $ENV{'EDITOR'} if (defined $ENV{'EDITOR'});
+    pb_system("$editor $ENV{'PBTMP'}/announce.html","Allowing modification of the announce","noredir");
 
     # Store it in DB for external usage (Web pages generation)