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

Timestamp:

Aug 30, 2017, 5:07:53 PM (7 years ago)

Author:

Bruno Cornec

Message:

FIX usage of PBCONFVER in VE/VM

File:

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

devel/pb/bin/pb

@@ -734 +734 @@
 # ---------------------------------------------------------------------------
 
-my ($projectbuilderver,$projectbuilderrev) = pb_version_init();
+my ($projectbuilderver,$projectbuilderrev,$projectbuilderconfver) = pb_version_init();
 my $appname = "pb";
 
 # Initialize the syntax string
 
-pb_syntax_init("$appname (aka project-builder.org) Version $projectbuilderver-$projectbuilderrev\n");
+pb_syntax_init("$appname (aka project-builder.org) Version $projectbuilderver-$projectbuilderrev Conf $projectbuilderconfver\n");
 
 GetOptions("help|?|h+" => \$opts{'h'}, 
@@ -3753 +3753 @@
 $ppref \$pbdisplaytype = "text";
 $ppref \$pblocale = "";
+$ppref \$PBCONFVER = $projectbuilderconfver;
 EOF
     print SCRIPT << 'EOF';
@@ -3774 +3775 @@
         print SCRIPT << "EOF";
 # For VE we need a good null dev
-# Except for RedHat 6.2 where it's good and doesnt like being recreated
+# Except for RedHat 6.2 where it's good and doesn't like being recreated
 EOF
         print SCRIPT "pb_system('rm -f /dev/null; mknod /dev/null c 1 3; chmod 777 /dev/null');\n" unless (($pbos->{'name'} =~ /^redhat/) && ($pbos->{'version'} =~ /^6/));
@@ -4110 +4111 @@
 sub pb_version_init {
 
-return("$projectbuilderver","$projectbuilderrev");
+return("$projectbuilderver","$projectbuilderrev","$projectbuilderconfver");
 }
 1;