Changeset 164 in ProjectBuilder for devel

Timestamp:

Sep 30, 2007, 6:51:07 PM (17 years ago)

Author:

Bruno Cornec

Message:

export TZ also
Still better example script in perl

Location:

devel/pb

Files:

• bin/pb (modified) (1 diff)
• contrib/pbsetupqemu (modified) (3 diffs)

devel/pb/bin/pb

@@ -638 +638 @@
     print SCRIPT "#Sync date\n";
     my $syncdate = strftime("%m%d%H%M", @date);
-    print SCRIPT "sudo date $syncdate\n";
+    print SCRIPT "export TZ=CEST ; sudo date $syncdate\n";
     print SCRIPT "# Build\n";
     my $p = "";

devel/pb/contrib/pbsetupqemu

@@ -1 @@
-#!/bin/bash
+#!/usr/bin/perl -w
 
 # Script to be used as pbscript to create a potentialy 
@@ -9 +9 @@
 # the pb account in the VM later on
 
-cat > /tmp/pbkey << EOF
-ssh-dss AAAAB3NzaC1kc3MAAACBAMC06bNLMu8ZBJv3Hi77+fi+GUhtQScIbGKru86C/IP27EjrmYhPVccbu8kpX6SDHIouhpZ00gaefP3zHjLUmPKlXkMNUNjxx5JNLPoHhSIuUvoSTNoh9gsi31abAvzbW+RNer7rvBJO4ytNJRdsuNxBwqjxK04JEmatds+aKTQjAAAAFQDHaNmIuvYZ0RtNBVe+tzTzxxCQmQAAAIA4o89Xob2VBRtQKBjmWVAuTS14qiqnQUPNloaRkM+r2odI+NJDFc+WXOIG9QAPKKt1jvFOBOX9Mu3/xwiDLnAGhxud98FoyHevSpIWUld7rG4j1aww1WxolFWY/iPyAvDDMW3iysCoqQeSOlpRd9Mz/dq6/P/VcizhdGOKyc3JBgAAAIAA1eY+BoneiQ/tQ8j3GYbMTu6U7VzZ2OaoVeQn4NtZmPl+ZeQIj83nFpo99mYCbaBPqnZToERndl+ljp/JX5pamwj6RcLIDCyiB6MXLbQSWj0goegU1htp5aMd3NcyR2Jy8gCnf0QjDr7j23Q+CFGExtRb/nsDmaG5W9D6QSWQ/g== bruno@victoria
-EOF
-chmod 644 /tmp/pbkey
+use strict;
+use File::Basename;
+use ProjectBuilder::Distribution qw (pb_distro_init); 
 
-grep -Eq '^pb:' /etc/passwd
-if [ $? -ne 0 ]; then
-    if [ ! -d /home ]; then
-        mkdir /home
-    fi
-    useradd pb
-fi
+my $file = "/tmp/pbkey";
+
+open(PBFILE,"> $file") || die "Unable to open $file";
+print PBFILE "ssh-dss AAAAB3NzaC1kc3MAAACBAMC06bNLMu8ZBJv3Hi77+fi+GUhtQScIbGKru86C/IP27EjrmYhPVccbu8kpX6SDHIouhpZ00gaefP3zHjLUmPKlXkMNUNjxx5JNLPoHhSIuUvoSTNoh9gsi31abAvzbW+RNer7rvBJO4ytNJRdsuNxBwqjxK04JEmatds+aKTQjAAAAFQDHaNmIuvYZ0RtNBVe+tzTzxxCQmQAAAIA4o89Xob2VBRtQKBjmWVAuTS14qiqnQUPNloaRkM+r2odI+NJDFc+WXOIG9QAPKKt1jvFOBOX9Mu3/xwiDLnAGhxud98FoyHevSpIWUld7rG4j1aww1WxolFWY/iPyAvDDMW3iysCoqQeSOlpRd9Mz/dq6/P/VcizhdGOKyc3JBgAAAIAA1eY+BoneiQ/tQ8j3GYbMTu6U7VzZ2OaoVeQn4NtZmPl+ZeQIj83nFpo99mYCbaBPqnZToERndl+ljp/JX5pamwj6RcLIDCyiB6MXLbQSWj0goegU1htp5aMd3NcyR2Jy8gCnf0QjDr7j23Q+CFGExtRb/nsDmaG5W9D6QSWQ/g== bruno\@victoria\n";
+close(PBFILE);
+chmod 0644,$file;
+
+$file="/etc/passwd";
+open(PBFILE,$file) || die "Unable to open $file";
+my $found = 0;
+while (<PBFILE>) {
+    $found = 1 if (/^pb:/);
+}
+close(PBFILE);
+
+if ( $found == 0 ) {
+    if ( ! -d "/home" ) {
+        mkdir "/home";
+    }
+    system "useradd pb";
+}
 
 # No passwd for pb only keys
-perl -pi -e 's/^pb:\!\!:/pb:*:/' /etc/shadow
+$file="/etc/shadow";
+open(PBFILE,$file) || die "Unable to open $file";
+while (<PBFILE>) {
+    s/^pb:\!\!:/pb:*:/;
+}
+close(PBFILE);
+
 # Adapt sudoers
-grep -Eq '^pb   ' /etc/sudoers
-if [ $? -ne 0 ]; then
-    echo "pb   ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
-fi
-# poweroff only
+$file="/etc/sudoers";
+$found = 0;
+open(PBFILE,$file) || die "Unable to open $file";
+while (<PBFILE>) {
+    $found = 1 if (/^pb   /);
+}
+close(PBFILE);
 
-su - pb -c "mkdir -p .ssh ; chmod 700 .ssh ; cp /tmp/pbkey .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys"
-rm -f /tmp/pbkey
+if ( $found == 0 ) {
+    open(PBFILE,">> $file") || die "Unable to open $file";
+    print PBFILE "pb   ALL=(ALL) NOPASSWD:ALL\n";
+}
+
+system 'su - pb -c "mkdir -p .ssh ; chmod 700 .ssh ; cp /tmp/pbkey .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys"';
+unlink "/tmp/pbkey";
+
+my ($ddir, $dver, $dfam, $dtype, $pbsuf) = pb_distro_init(); 
 
 # Get and install pb
-if [ -x /usr/bin/yum ]; then
-    yum clean all
-    # FC6
-    #yum -y install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget vim gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs perl-AppConfig perl-DateManip
-    # FC4
-    yum -y install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs perl-DateManip
-    rm -rf AppConfig-*
-    wget http://search.cpan.org/CPAN/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz
-    tar xvfz AppConfig-1.66.tar.gz
-    cd AppConfig*
-    perl Makefile.PL
-    make
-    make install
-    cd ..
-elif [ -x /usr/sbin/urpmi ]; then
-    urpmi --auto-select neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch mindi mondo mkisofs cdrecord perl-AppConfig perl-DateManip
-elif [ -x /usr/bin/apt-get ]; then
-    apt-get install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev debian-builder dh-make fakeroot libnewt-dev libncurses5-dev
-elif [ -x /usr/sbin/emerge ]; then
-    emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi mondo-rescue cdrecord mkisofs    
-else
-    echo "No pkg to install"
-fi
+if ( $ddir eq "fedora" ) {
+    system "yum clean all";
+    if ( $dver <= 4 ) {
+        # FC4
+        system "yum -y install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs perl-DateManip ; rm -rf AppConfig-* ; wget http://search.cpan.org/CPAN/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz ; tar xvfz AppConfig-1.66.tar.gz ; cd AppConfig* ; perl Makefile.PL ; make ; make install ; cd ..";
+    } else {
+        # FC5/6/7
+        system "yum -y install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget vim gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs perl-AppConfig perl-DateManip";
+    }
+} elsif ( $dfam eq "md" ) {
+    system "urpmi --auto-select neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch mindi mondo mkisofs cdrecord perl-AppConfig perl-DateManip";
+} elsif ( $dfam eq "du" ) {
+    system "apt-get install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev debian-builder dh-make fakeroot libnewt-dev libncurses5-dev";
+} elsif ( $dfam eq "gen" ) {
+    system "emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi mondo-rescue cdrecord mkisofs";
+} else {
+    print "No pkg to install\n";
+}
 
-cat > /tmp/pbpatch << 'EOF'
+$file = "/tmp/pbpatch";
+unlink $file;
+
+open(PBFILE,"> $file") || die "Unable to open $file";
+print PBFILE << 'EOF';
 --- File.pm     2007-09-29 14:55:28.000000000 +0100
 +++ File.pm.new 2007-09-29 14:55:44.000000000 +0100
@@ -85 +112 @@
 
 EOF
+close(PBFILE);
 
 # Patch AppConfig 
-file=`find /usr/lib/perl5 -type f -name File.pm | grep AppConfig/File.pm`
-grep -q 'Fix a bug if the variable is a hash' $file
-if [ $? -ne 0 ]; then
-    (cd `dirname $file` ; patch -s -p0 < /tmp/pbpatch)
-    if [ $? -eq 0 ]; then
-        rm -f /tmp/pbpatch
-    fi
-fi
+my $module=`find /usr/lib/perl5 -type f -name File.pm | grep AppConfig/File.pm`;
+chomp($module);
+$found = 0;
+open(PBFILE,$module) || die "Unable to open $module";
+while (<PBFILE>) {
+    $found = 1 if (/Fix a bug if the variable is a hash/);
+}
+close(PBFILE);
 
-rm -rf project-builder-*
-wget ftp://ftp.mondorescue.org/src/project-builder-latest.tar.gz
-tar xvfz project-builder-latest.tar.gz
-cd project-builder-*
-perl Makefile.PL
-make
-make install
-cd ..
+if ( $found == 0 ) {
+    chdir basename($module);
+    open(PBFILE,$module) || die "Unable to open $module";
+    my $module1 = $module."new";
+    open(PBOUT," > $module1") || die "Unable to open $module1";
+    while (<PBFILE>) {
+            s/^use AppConfig;/use AppConfig qw(:argcount);/;
+            if (/# variables prefixed '-' are reset to their default values/) {
+print PBOUT << 'EOF';
+                 # Fix a bug if the variable is a hash - 1 has been created as a key
+                 if ($nargs eq AppConfig::ARGCOUNT_HASH) {
+                     delete $state->{ VARIABLE }->{ $variable }{1};
+                 }
+
+EOF
+            }
+            print PBOUT "$_";
+    }
+    close(PBFILE);
+    close(PBOUT);
+    rename($module1,$module);
+}
+
+system "rm -rf project-builder-* ; wget ftp://ftp.mondorescue.org/src/project-builder-latest.tar.gz ; tar xvfz project-builder-latest.tar.gz ; cd project-builder-* ; perl Makefile.PL ; make ; make install ; cd ..";