tazwok rev 421 4.3

Merge changes from default
author Antoine Bodin <gokhlayeh@slitaz.org>
date Sun Mar 06 17:05:41 2011 +0100 (2011-03-06)
parents bedddc4f90f4 4032fb1d58d2
children 5b8e38bbae17
files tazwok
line diff
     1.1 --- a/.hgtags	Sat Mar 05 01:06:05 2011 +0100
     1.2 +++ b/.hgtags	Sun Mar 06 17:05:41 2011 +0100
     1.3 @@ -19,3 +19,4 @@
     1.4  57321b17f1b95df4de7c05cfc30a2eb1e394f65a 4.2.2
     1.5  44c327b2c5f807df9a580eaf6424d8096d71cad0 4.2.3
     1.6  13e14fe449a3fd68126f9df0a0ed40a5dd5f98c6 4.2.4
     1.7 +433aa071e16c7f61966e426207dfa3f142859458 4.2.5
     2.1 --- a/tazwok	Sat Mar 05 01:06:05 2011 +0100
     2.2 +++ b/tazwok	Sun Mar 06 17:05:41 2011 +0100
     2.3 @@ -523,14 +523,11 @@
     2.4  		cd $SOURCES_REPOSITORY
     2.5  		if [ "$SOURCE" ]; then
     2.6  			alt_url="http://mirror.slitaz.org/sources/packages/${SOURCE:0:1}/$SOURCE-$VERSION.tar.lzma"
     2.7 -			alt_url2="http://mirror.slitaz.org/sources/packages/${SOURCE:0:1}/$TARBALL"
     2.8  		else
     2.9  			alt_url="http://mirror.slitaz.org/sources/packages/${PACKAGE:0:1}/$PACKAGE-$VERSION.tar.lzma"
    2.10 -			alt_url2="http://mirror.slitaz.org/sources/packages/${PACKAGE:0:1}/$TARBALL"
    2.11  		fi
    2.12 -		download $WGET_URL $alt_url $alt_url2 http://mirror.slitaz.org/sources/packages/${file:0:1}/$file
    2.13 +		download $WGET_URL $alt_url http://mirror.slitaz.org/sources/packages/${TARBALL:0:1}/$TARBALL
    2.14  		unset alt_url
    2.15 -		unset alt_url2
    2.16  		if [ ! -f "$SOURCES_REPOSITORY/$TARBALL" ] && \
    2.17  			[ ! -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" ] && \
    2.18  			[ ! -d $tmp_src ]; then
     3.1 --- a/web/download.php	Sat Mar 05 01:06:05 2011 +0100
     3.2 +++ b/web/download.php	Sun Mar 06 17:05:41 2011 +0100
     3.3 @@ -15,6 +15,6 @@
     3.4  	readfile("$version-$package");
     3.5  }
     3.6  else {
     3.7 -	echo "Strange things happens...";
     3.8 +	echo "Strange things happen...";
     3.9  }
    3.10 -?>
    3.11 \ No newline at end of file
    3.12 +?>
     4.1 --- a/web/index.php	Sat Mar 05 01:06:05 2011 +0100
     4.2 +++ b/web/index.php	Sun Mar 06 17:05:41 2011 +0100
     4.3 @@ -107,7 +107,7 @@
     4.4  		<p>
     4.5  			Note: Flavors/Iso build logs are named "iso-?flavor",
     4.6  			Temporary toolchain logs are named "tmp-toolchain-?package"
     4.7 -			and check-incoming log is named "incoming".
     4.8 +			and the check-incoming log is named "incoming".
     4.9  		</p>
    4.10  	<!-- Top block end -->
    4.11  	</div>
     5.1 --- a/web/log.php	Sat Mar 05 01:06:05 2011 +0100
     5.2 +++ b/web/log.php	Sun Mar 06 17:05:41 2011 +0100
     5.3 @@ -18,6 +18,6 @@
     5.4  	}
     5.5  }
     5.6  else {
     5.7 -	echo "Strange things happens...";
     5.8 +	echo "Strange things happen...";
     5.9  }
    5.10  ?>