slitaz-dev-tools rev 151

mirror tools: tiny edits
author Paul Issott <paul@slitaz.org>
date Sun Mar 11 13:07:55 2012 +0000 (2012-03-11)
parents 235e71289a6f
children b571aa2a37b0
files README mirror-tools/rootfs/home/backups/mirror/backup.sh mirror-tools/rootfs/usr/bin/mkpkgiso mirror-tools/rootfs/usr/bin/rolling.sh mirror-tools/slitaz/mirror/dvd/index.html mirror-tools/slitaz/mirror/floppies/builder/index.php
line diff
     1.1 --- a/README	Sat Mar 10 10:24:50 2012 +0100
     1.2 +++ b/README	Sun Mar 11 13:07:55 2012 +0000
     1.3 @@ -20,7 +20,7 @@
     1.4  
     1.5  Website Devel corner   : http://www.slitaz.org/en/devel/
     1.6  Mercurial repositories : http://hg.slitaz.org/
     1.7 -Bugu tracker           : http://bugs.slitaz.org/
     1.8 +Bug tracker            : http://bugs.slitaz.org/
     1.9  Cookbook doc           : http://doc.slitaz.org/en:cookbook:start
    1.10  Build host             : http://tank.slitaz.org/
    1.11  Build bot              : http://cook.slitaz.org/
     2.1 --- a/mirror-tools/rootfs/home/backups/mirror/backup.sh	Sat Mar 10 10:24:50 2012 +0100
     2.2 +++ b/mirror-tools/rootfs/home/backups/mirror/backup.sh	Sun Mar 11 13:07:55 2012 +0000
     2.3 @@ -78,6 +78,6 @@
     2.4  
     2.5  [ -n "$REMOTE_USER" ] && for i in $(cd .. ; ls); do
     2.6  	[ $i == $(hostname) -o $i.slitaz.org == $(hostname) ] && continue
     2.7 -	echo "Get backups from $i ..."
     2.8 +	echo "Getting backups from $i ..."
     2.9  	rsync -aH -e "$SSH" --bwlimit=50 $REMOTE_USER@$i.slitaz.org:/home/backups/$i/. ../$i/.
    2.10  done
     3.1 --- a/mirror-tools/rootfs/usr/bin/mkpkgiso	Sat Mar 10 10:24:50 2012 +0100
     3.2 +++ b/mirror-tools/rootfs/usr/bin/mkpkgiso	Sun Mar 11 13:07:55 2012 +0000
     3.3 @@ -61,7 +61,7 @@
     3.4  	exit 1
     3.5  fi
     3.6  
     3.7 -# Check if we provide a valide version
     3.8 +# Check if we provide a valid version
     3.9  if [ ! -d $REPOS ]; then
    3.10  	echo "Boooh! $PKG_VER is not a valid version."
    3.11  	exit 1
     4.1 --- a/mirror-tools/rootfs/usr/bin/rolling.sh	Sat Mar 10 10:24:50 2012 +0100
     4.2 +++ b/mirror-tools/rootfs/usr/bin/rolling.sh	Sun Mar 11 13:07:55 2012 +0000
     4.3 @@ -47,12 +47,12 @@
     4.4  		 $TMP/fs/var/cache/tazpkg/cooking/packages
     4.5  	chown -R root.root $TMP
     4.6  	chmod -R 755 $TMP
     4.7 -	echo "Create system chroot with $system ..."
     4.8 +	echo "Creating system chroot with $system ..."
     4.9  	mount -o loop,ro $system $TMP/iso
    4.10  	for i in $(ls -r $TMP/iso/boot/rootfs*.gz) ; do
    4.11  		unlzma -c $i | ( cd $TMP/fs ; cpio -idmu )
    4.12  	done
    4.13 -	echo "Get cooking packages & flavors ..."
    4.14 +	echo "Getting cooking packages & flavors ..."
    4.15  	mount --bind $packages $TMP/fs/var/cache/tazpkg/cooking/packages
    4.16  	ln -s /var/cache/tazpkg/cooking/packages $TMP/fs/home/slitaz/cooking
    4.17  	# 3.0 compatibility...
    4.18 @@ -62,7 +62,7 @@
    4.19  	[ -d $rolling/fixes ] && cp -a $rolling/fixes/. $TMP/fs/.
    4.20  	echo "cooking" > $TMP/fs/etc/slitaz-release
    4.21  	umount -d $TMP/iso
    4.22 -	echo "Create build.sh script ..."
    4.23 +	echo "Creating build.sh script ..."
    4.24  	cat > $TMP/fs/root/build.sh <<EOT
    4.25  #!/bin/sh
    4.26  
    4.27 @@ -107,7 +107,7 @@
    4.28  	[ -d $TMP/fs/home/slitaz/cooking/distro ] || 
    4.29  	ln -s ../distro $TMP/fs/home/slitaz/cooking/distro
    4.30  	umount $TMP/fs/var/cache/tazpkg/cooking/packages
    4.31 -	echo "Get back slitaz-$flavor.* files ..."
    4.32 +	echo "Getting back slitaz-$flavor.* files ..."
    4.33  	mv -f $TMP/fs/home/slitaz/cooking/distro/slitaz-$flavor.* $rolling/
    4.34  	mv -f $TMP/slitaz-$flavor.log $rolling/
    4.35  	htmlize < $rolling/slitaz-$flavor.log > $rolling/slitaz-$flavor.log.html
     5.1 --- a/mirror-tools/slitaz/mirror/dvd/index.html	Sat Mar 10 10:24:50 2012 +0100
     5.2 +++ b/mirror-tools/slitaz/mirror/dvd/index.html	Sun Mar 11 13:07:55 2012 +0000
     5.3 @@ -300,16 +300,16 @@
     5.4  </script>
     5.5  
     5.6  <p>
     5.7 -<sup>1</sup> SliTaz can't and don't want to provide non free software. 
     5.8 +<sup>1</sup> SliTaz can't and doesn't want to provide non free software. 
     5.9  Many people want to use software such as <b>Opera</b>, <b>Skype &#9742;</b> or <b>flash-plugin</b>.
    5.10 -SliTaz provides some <u>get-*</u> scripts to let you install it.
    5.11 -The DVD creation tool will lauch this script, repackage the software and 
    5.12 +SliTaz provides some <u>get-*</u> scripts to let you install them.
    5.13 +The DVD creation tool will launch this script, repackage the software and 
    5.14  store it in the package directory.
    5.15  </p>
    5.16  
    5.17  <p>
    5.18  <sup>2</sup> Some software such as <b>OpenOffice</b> or <b>LibreOffice</b> are
    5.19 -so huge that they don't compile on SliTaz buid bot.
    5.20 +so huge that they don't compile on a SliTaz build bot.
    5.21  The DVD creation tool will use <u>get-*</u> scripts (see above) to store these
    5.22  packages in the package directory. The scripts download pre-built binaries for
    5.23  another Linux distribution.
    5.24 @@ -317,7 +317,7 @@
    5.25  
    5.26  <p>
    5.27  <sup>3</sup> Original source files. Install <u>SliTaz wok</u> to get the SliTaz
    5.28 -patchs.
    5.29 +patches.
    5.30  </p>
    5.31  <!-- End of content -->
    5.32  </div>
     6.1 --- a/mirror-tools/slitaz/mirror/floppies/builder/index.php	Sat Mar 10 10:24:50 2012 +0100
     6.2 +++ b/mirror-tools/slitaz/mirror/floppies/builder/index.php	Sun Mar 11 13:07:55 2012 +0000
     6.3 @@ -395,7 +395,7 @@
     6.4  </p>
     6.5  
     6.6  <p>
     6.7 -The floppy set detects disk swaps and can be used without keyboard.
     6.8 +The floppy set detects disk swaps and can be used without a keyboard.
     6.9  </p>
    6.10  <?php
    6.11  		}