Changeset 159

Timestamp:

09/28/07 02:35:11 (6 years ago)

Author:

bruno

Message:

That script has worked for fedora_6

File:

• devel/pb/contrib/pbsetupqemu (modified) (2 diffs)

devel/pb/contrib/pbsetupqemu

@@ -34 +34 @@
 if [ -x /usr/bin/yum ]; then
     yum clean all
-    yum 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
-elif [-x /usr/sbin/urpmi ]; then
-    urpmi 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
-elif [-x /usr/bin/apt-get ]; then
+    #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
+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
 
 cat > /tmp/pbpatch << EOF
---- /usr/lib/perl5/vendor_perl/5.8.8/AppConfig/File.pm.orig     2007-08-09 17:44:26.000000000 +0200
-+++ /usr/lib/perl5/vendor_perl/5.8.8/AppConfig/File.pm  2007-08-09 18:04:46.000000000 +0200
+
+--- /usr/lib/perl5/vendor_perl/5.8.8/AppConfig/File.pm.orig 2007-08-09 17:44:26.000000000 +0200
++++ /usr/lib/perl5/vendor_perl/5.8.8/AppConfig/File.pm  2007-08-09 18:04:46.000000000 +0200
 @@ -20,7 +20,7 @@
-
+ 
  require 5.005;
-
+ 
 -use AppConfig;
 +use AppConfig qw(:argcount);
  use AppConfig::State;
  use File::HomeDir;
-
+ 
 @@ -227,6 +227,11 @@
-
-                my $nargs = $state->_argcount($variable);
-
-+               # 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};
-+               }
+ 
+        my $nargs = $state->_argcount($variable);
+ 
++       # 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};
++       }
 +
-                # variables prefixed '-' are reset to their default values
-                if ($flag eq '-') {
-                    $state->_default($variable);
+        # variables prefixed '-' are reset to their default values
+        if ($flag eq '-') {
+            $state->_default($variable);
 EOF
 
@@ -72 +75 @@
 grep -q 'Fix a bug if the variable is a hash' /usr/lib/perl5/vendor_perl/*/AppConfig/File.pm
 if [ $? -ne 0 ]; then
-    cd /usr/lib/perl5/vendor_perl/*/AppConfig
-    patch -s -p1 < /tmp/pbpatch
+    (cd /usr/lib/perl5/vendor_perl/*/AppConfig ; patch -s -p0 < /tmp/pbpatch)
     if [ $? -eq 0 ]; then
         rm -f /tmp/pbpatch