Changeset 2136 in ProjectBuilder for devel/pb-modules

Timestamp:

Aug 28, 2016, 8:03:38 PM (8 years ago)

Author:

Bruno Cornec

Message:

Fix #115

The standard conf file is now under /usr/share/pb and the one under
/etc/pn is modifyable by the sysadmin is contains only comments by
default.

Location:

devel/pb-modules

Files:

• Makefile.PL (modified) (4 diffs)
• lib/ProjectBuilder/Distribution.pm (modified) (3 diffs)

devel/pb-modules/Makefile.PL

@@ -22 +22 @@
     EXE_FILES     => [ qw(bin/pbdistrocheck bin/pbgetparam) ],
     MAN1PODS      => { 
-                        'bin/pbdistrocheck' => '$(INST_MAN1DIR)/pbdistrocheck.$(MAN1EXT)', 
-                        'bin/pbgetparam' => '$(INST_MAN1DIR)/pbgetparam.$(MAN1EXT)', 
+                'bin/pbdistrocheck' => '$(INST_MAN1DIR)/pbdistrocheck.$(MAN1EXT)', 
+                'bin/pbgetparam' => '$(INST_MAN1DIR)/pbgetparam.$(MAN1EXT)', 
                     },
 #   MAN3PODS      => {  'lib/ProjectBuilder/Distribution.pm' => '$(INST_MAN3DIR)/ProjectBuilder::Distribution.$(MAN3EXT)',
@@ -37 +37 @@
 sub postamble {
 
-    # Determine location of etc conf files
+    # Determine location of conf files
     my $text ="";
 
-    # Grab out any CONFDIR or MANDIR param
-    my $etcdir = undef;
+    # Grab out any SYSCONFDIR, CONFDIR or MANDIR param
+    my $sharedir = undef;
     my $mandir = undef;
+    my $sysconfdir = undef;
     my $prefix = undef;
 
@@ -48 +49 @@
         my ($key, $value) = split /=/, $arg;
         if ($key =~ /^CONFDIR$/) {
-            $etcdir = $value;
+            $sharedir = $value;
+        } elsif ($key =~ /^SYSCONFDIR$/) {
+            $sysconfdir = $value;
         } elsif ($key =~ /^MANDIR$/) {
             $mandir = $value;
@@ -56 +59 @@
     }
 
-    $etcdir ||= "$prefix/etc/pb" if (defined $prefix);
+    $sharedir ||= "$prefix/share/pb" if (defined $prefix);
     $mandir ||= "$prefix/share/man" if (defined $prefix);
-    $etcdir ||= "/usr/local/etc/pb";
+    $sysconfdir ||= "$prefix/etc/pb" if (defined $prefix);
+    $sharedir ||= "/usr/local/share/pb";
     $mandir ||= "/usr/local/share/man";
+    $sysconfdir ||= "/etc/pb";
 
     # Use that conf dir info to modify Distribution.pm
-    system("perl -pi -e \"s~CCCC~$etcdir~\" lib/ProjectBuilder/Distribution.pm");
+    system("perl -pi -e \"s~CCCC~$sharedir~\" lib/ProjectBuilder/Distribution.pm");
+    system("perl -pi -e \"s~SSSS~$sysconfdir~\" lib/ProjectBuilder/Distribution.pm");
 
     $text .= "install ::\n";
-    $text .= "\t".'mkdir -p $(DESTDIR)'."$etcdir\n";
-    $text .= "\t".'chmod 755 $(DESTDIR)'."$etcdir\n";
-    $text .= "\t".'cp etc/pb.conf $(DESTDIR)'."$etcdir\n";
+    $text .= "\t".'mkdir -p $(DESTDIR)'."$sharedir\n";
+    $text .= "\t".'chmod 755 $(DESTDIR)'."$sharedir\n";
+    $text .= "\t".'cp etc/pb.conf $(DESTDIR)'."$sharedir\n";
+
+    # Also create a fake version in /etc/pb for sysadmin to modify
+    $text .= "\t".'mkdir -p $(DESTDIR)'."$sysconfdir\n";
+    $text .= "\t".'chmod 755 $(DESTDIR)'."$sysconfdir\n";
+    $text .= "\t".'perl -p -e \'s|^|#|\' etc/pb.conf > $(DESTDIR)/'."$sysconfdir/pb.conf\n";
+    # Doesn't seem to work in the makefile generated for now :-(
+    #$text .= "\t".'perl -p -e \'s|^([^#])|#$1|\' etc/pb.conf > $(DESTDIR)/'."$sysconfdir/pb.conf\n";
 
     # Produce the man page for pb.conf

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

@@ -33 +33 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_distro_init pb_distro_conffile pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_get_param pb_distro_get_context pb_distro_to_keylist pb_distro_conf_print pb_apply_conf_proxy);
+our @EXPORT = qw(pb_distro_init pb_distro_conffile pb_distro_sysconffile pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_get_param pb_distro_get_context pb_distro_to_keylist pb_distro_conf_print pb_apply_conf_proxy);
 ($VERSION,$REVISION) = pb_version_init();
 
@@ -78 +78 @@
 
 return("CCCC/pb.conf");
+}
+
+=item B<pb_distro_sysconffile>
+
+This function returns the optional configuration file used for local customization
+
+=cut
+
+sub pb_distro_sysconffile {
+
+return("SSSS/pb.conf");
 }
 
@@ -122 +133 @@
 # depending whether we deal with package install or tar file install
 pb_conf_add(pb_distro_conffile());
+
+# Similarly for the local file available for sysadmin. After the previous one to allow overwrite to work
+pb_conf_add(pb_distro_sysconffile());
 
 # If we don't know which distribution we're on, then guess it