Changeset 1567 in ProjectBuilder

Timestamp:

May 23, 2012, 3:13:40 AM (12 years ago)

Author:

Bruno Cornec

Message:

Adding pbcl for afio

File:

• devel/pb/t/pbtest (modified) (15 diffs)

devel/pb/t/pbtest

@@ -19 +19 @@
 grep -q pbtest /etc/passwd
 if [ $? -eq 0 ]; then
-    rm -rf ~pbtest/* ~pbtest/.??*
+    sudo rm -rf ~pbtest/* ~pbtest/.??*
     sudo groupdel pbtest
     sudo userdel pbtest
@@ -26 +26 @@
 sudo grep -q pbtest /etc/sudoers
 if [ $? -ne 0 ]; then
-    sudo cat >> /etc/sudoers << EOF
+    cat >> /tmp/sudoers << EOF
 pbtest localhost=/usr/sbin/chroot NOPASSWD:
 pbtest localhost=/bin/cp NOPASSWD:
 EOF
+    sudo cat /etc/sudoers /tmp/sudoers > /tmp/sudoers2
+    sudo mv /tmp/sudoers2 /etc/sudoers
+    rm -f /tmp/sudoers /tmp/sudoers2
 fi
 
@@ -35 +38 @@
 # SVN repo setup
 sudo su - pbtest -c "mkdir -p prj ; svnadmin create prj/svn"
-sudo cat >> ~pbtest/prj/svn/conf/authz << EOF
+cat >> /tmp/authz << EOF
 [/]
 pbtest = rw
 * = r
 EOF
-sudo cat >> ~pbtest/prj/svn/conf/passwd << EOF
+sudo mv /tmp/authz ~pbtest/prj/svn/conf/authz
+cat >> /tmp/passwd << EOF
 pbtest = pbtest
 EOF
-sudo cat > ~pbtest/prj/svn/conf/svnserve.conf << EOF
+sudo mv /tmp/passwd ~pbtest/prj/svn/conf/passwd
+cat > /tmp/svnserve.conf << EOF
 [general]
 password-db = passwd
@@ -49 +54 @@
 [sasl]
 EOF
+sudo mv /tmp/svnserve.conf ~pbtest/prj/svn/conf/svnserve.conf
 sudo chown pbtest:pbtest ~pbtest/prj/svn/conf/authz ~pbtest/prj/svn/conf/passwd ~pbtest/prj/svn/conf/svnserve.conf
 sudo su - pbtest -c "svnserve -d -r ~pbtest/prj/svn"
@@ -56 +62 @@
 sudo su - pbtest -c "pbdistrocheck"
 sudo su - pbtest -c "pb clean"
-sudo cat > /tmp/.pbrc << EOF
+cat > /tmp/.pbrc << EOF
 # Projects
 pbconfurl afio = svn://localhost/pb/afio/pbconf
-pbdefdir default = $ENV{'HOME'}/pb
-pbconfurl projtest = dir://$ENV{'HOME'}/projtest
-pbconfdir projtest = $ENV{'HOME'}/projtest/pbconf
+pbdefdir default = \$ENV{'HOME'}/pb
+pbconfurl projtest = dir://\$ENV{'HOME'}/projtest
+pbconfdir projtest = \$ENV{'HOME'}/projtest/pbconf
 pburl projtest = svn+ssh://svn.project-builder.org/prj/svn/pb
 pbconfurl pb = svn+ssh://svn.project-builder.org/prj/svn/pb/pbconf
-pbconfdir pb = $ENV{'HOME'}/pb/pbconf
+pbconfdir pb = \$ENV{'HOME'}/pb/pbconf
 pburl pb = svn+ssh://svn.project-builder.org/prj/svn/pb
 pburl mondorescue = svn://svn.mondorescue.org/mondorescue/branches
@@ -71 +77 @@
 vmport pb = 2200
 pbparallel pb = 6
-vepath default = $ENV{'HOME'}/ve
+vepath default = \$ENV{'HOME'}/ve
 vmtype default = kvm
 vmcmd default = qemu-kvm
-vmpath default = $ENV{'HOME'}/tmp
+vmpath default = \$ENV{'HOME'}/tmp
 vmsize fedora = 10G
 vmmonport default = 4000
@@ -80 +86 @@
 sudo mv /tmp/.pbrc ~pbtest/.pbrc
 
-sudo cat > /tmp/.pbrc << EOF
+cat > /tmp/.pbrc << EOF
 vetype default = chroot
 verpmtype default = rpmbootstrap
@@ -89 +95 @@
 velogin default = pbtest
 EOF
-sudo echo "velist default = `echo $TESTVEDIST | sed 's/ */,/g'`" >> /tmp/.pbrc
+echo "velist default = `echo $TESTVEDIST | sed 's/ */,/g'`" >> /tmp/.pbrc
 sudo mv /tmp/.pbrc ~pbtest/ve/.pbrc
 sudo chown pbtest:pbtest ~pbtest/.pbrc ~pbtest/ve/.pbrc
@@ -99 +105 @@
 sudo su - pbtest -c "cd pb ; svn co svn://localhost/pb ."
 sudo su - pbtest -c "pb -p afio newproj afio"
-sudo cat >> ~pbtest/pb/afio/pbconf/afio.pb << EOF
+cat >> /tmp/afio.pb << EOF
 defpkgdir afio = dummy
 projver afio = 2.5
@@ -107 +113 @@
 sshhost afio = localhost
 sshlogin afio = pbtest
-sshdir afio = $ENV{'HOME'}/ftp
-EOF
+sshdir afio = \$ENV{'HOME'}/ftp
+EOF
+sudo mv /tmp/afio.pb ~pbtest/pb/afio/pbconf/afio.pb
+sudo chown pbtest:pbtest ~pbtest/pb/afio/pbconf/afio.pb
 sudo su - pbtest -c "pb -p afio sbx2build"
 
-sudo cat >> ~pbtest/pb/afio/pbconf/pbfilter/all.pbf << EOF
+cat >> /tmp/all.pbf << EOF
 filter PBSRC = src/%{name}-%{version}.tar.gz
 filter PBDESC = afio is a cpio compatible archiver with extended features$/It can compress on a file by file basis.
@@ -118 +126 @@
 filter PBLOG = no
 EOF
-sudo cat >> ~pbtest/pb/afio/pbconf/pbfilter/rpm.pbf << EOF
+sudo mv /tmp/all.pbf ~pbtest/pb/afio/pbconf/pbfilter/all.pbf
+sudo chown pbtest:pbtest ~pbtest/pb/afio/pbconf/pbfilter/all.pbf
+cat >> /tmp/rpm.pbf << EOF
 filter PBGRP = Applications/Archiving
 filter PBLIC = Afio
 EOF
+sudo mv /tmp/rpm.pbf ~pbtest/pb/afio/pbconf/pbfilter/rpm.pbf
+sudo chown pbtest:pbtest ~pbtest/pb/afio/pbconf/pbfilter/rpm.pbf 
 sudo su - pbtest -c "pb -p afio sbx2build"
 
@@ -136 +148 @@
 sudo su - pbtest -c "pb -p pb pkg2ssh"
 
-sudo cat >> ~pbtest/pb/afio/pbconf/afio/pbcl << EOF
+cat >> /tmp/pbcl << EOF
 # $Id$
 
@@ -144 +156 @@
 - First packages created
 EOF
+sudo mv /tmp/pbcl ~pbtest/pb/afio/pbconf/afio/pbcl
+chown pbtest:pbtest ~pbtest/pb/afio/pbconf/afio/pbcl
 svn add ~pbtest/pb/afio/pbconf/afio/pbcl
 svn ci -m 'Adding pbcl for afio'
@@ -150 +164 @@
 sudo perl -pi -e 's|Recommends: PBREC||' ~pbtest/pb/afio/pbconf/afio/deb/control
 sudo perl -pi -e 's|Suggests: PBSUG||' ~pbtest/pb/afio/pbconf/afio/deb/control
-sudo cat > ~pbtest/pb/afio/pbconf/afio/deb/afio.docs << EOF
+cat > /tmp/afio.docs << EOF
 HISTORY
 PORTING
@@ -163 +177 @@
 script4
 EOF
+sudo mv /tmp/afio.docs ~pbtest/pb/afio/pbconf/afio/deb/afio.docs
+
 sudo perl -pi -e 's|config.status: configure|config.status: Makefile|' ~pbtest/pb/afio/pbconf/afio/deb/rules
 sudo perl -pi -e 's|dh_installchangelogs ChangeLog|dh_installchangelogs debian/changelog|' ~pbtest/pb/afio/pbconf/afio/deb/rules