# HG changeset patch # User Pascal Bellard # Date 1417508049 -3600 # Node ID bd0e2ed0e601648172555caedd95c16ad1e353ba # Parent 608981c962f8366438612540b7b36e97f195f038 tazpkg-convert: update WEB_SITE in debian packages diff -r 608981c962f8 -r bd0e2ed0e601 tazpkg --- a/tazpkg Tue Dec 02 04:15:03 2014 +0200 +++ b/tazpkg Tue Dec 02 09:14:09 2014 +0100 @@ -841,6 +841,9 @@ set -e . $SCRIPT set +e + cd $TMP_DIR + [ -d $PACKAGE-$VERSION ] || abort_package \ + "Could not download ${TARBALL:-$PACKAGE} from ${WGET_URL:-$WEB_SITE}. Exiting." if [ ! -s $PACKAGE-$VERSION/receipt ]; then cat > $PACKAGE-$VERSION/receipt <> $PACKAGE-$VERSION/receipt fi diff -r 608981c962f8 -r bd0e2ed0e601 tazpkg-convert --- a/tazpkg-convert Tue Dec 02 04:15:03 2014 +0200 +++ b/tazpkg-convert Tue Dec 02 09:14:09 2014 +0100 @@ -146,11 +146,12 @@ { mkdir -p $TMP_DIR tar xOzf $PACKAGE_FILE ./control.tar.gz | tar xzf - -C $TMP_DIR - package="$(grep ^Package $TMP_DIR/control | sed 's/.*: //')" - version="$(grep ^Version $TMP_DIR/control | sed 's/.*: //')" - maintainer="$(grep ^Maintainer $TMP_DIR/control | sed 's/.*: //')" - target="$(grep ^Architecture $TMP_DIR/control | sed 's/.*: //')" - descrip="$(grep ^Description $TMP_DIR/control | sed 's/.*: //')" + package=$(sed '/^Package/!d;s/.*: //' $TMP_DIR/control) + version=$(sed '/^Version/!d;s/.*: //' $TMP_DIR/control) + maintainer="$(sed '/^Maintainer/!d;s/.*: //' $TMP_DIR/control)" + target="$(sed '/^Architecture/!d;s/.*: //' $TMP_DIR/control)" + descrip=$(sed '/^Description/!d;s/.*: //' $TMP_DIR/control) + homepage=$(sed '/^Homepage/!d;s/.*: //' $TMP_DIR/control) url="http://openwrt.org/" case "$target" in i386|all) @@ -165,7 +166,7 @@ VERSION="$version" CATEGORY="misc" SHORT_DESC="$descrip" -WEB_SITE="$url" +WEB_SITE="${homepage:-$url}" MAINTAINER="$maintainer" DEPENDS="$(find_depends)" EOT @@ -216,11 +217,11 @@ busybox tar xf $PACKAGE_FILE -C $TMP_DIR/fs if [ -f $TMP_DIR/fs/.PKGINFO ]; then cd $TMP_DIR - package="$(grep ^pkgname fs/.PKGINFO | sed 's/.*= //')" - version="$(grep ^pkgver fs/.PKGINFO | sed 's/.*= //')" - descrip="$(grep ^pkgdesc fs/.PKGINFO | sed 's/.*= //')" - url="$(grep ^url fs/.PKGINFO | sed 's/.*= //')" - maintainer="$(grep ^packager fs/.PKGINFO | sed 's/.*= //')" + package="$(sed '/^pkgname/!d;s/.*= //' fs/.PKGINFO)" + version="$(sed '/^pkgver/!d;s/.*= //' fs/.PKGINFO)" + descrip="$(sed '/^pkgdesc/!d;s/.*= //' fs/.PKGINFO)" + url="$(sed '/^url/!d;s/.*= //' fs/.PKGINFO)" + maintainer="$(sed '/^packager/!d;s/.*= //' fs/.PKGINFO)" file=$package-$version mkdir $file mv fs $file @@ -392,8 +393,8 @@ tar xzf $PACKAGE_FILE -C $TMP_DIR/$file/fs cd $TMP_DIR if [ -d $file/fs/install ]; then - descrip=$(grep ^$package $file/fs/install/slack-desc | \ - head -1 | sed 's/.*(\(.*\)).*/\1/') + descrip=$(sed "/^$package/!d;s/.*(\\(.*\\)).*/\\1/;q" \ + $file/fs/install/slack-desc) cat > $file/receipt < $file/description.txt + sed "/^$package/:d;s/^$package://" \ + $file/fs/install/slack-desc > $file/description.txt [ -s $file/description.txt ] || rm -f $file/description.txt rm -rf $file/fs/install tazpkg pack $file @@ -436,13 +437,11 @@ { mkdir -p $TMP_DIR dpkg-deb -e $PACKAGE_FILE $TMP_DIR - package=$(grep '^ *Package:' $TMP_DIR/control) - package=$(echo ${package##*:}) - version=$(grep '^ *Version:' $TMP_DIR/control) - version=$(echo ${version##*:}) - descrip=$(grep '^ *Description:' $TMP_DIR/control) - descrip=$(echo ${descrip##*:}) - target="$(grep ^Architecture $TMP_DIR/control | sed 's/.*: //')" + package=$(sed '/^ *Package:/!d;s/.*: //' $TMP_DIR/control) + version=$(sed '/^ *Version:/!d;s/.*: //' $TMP_DIR/control) + descrip=$(sed '/^ *Description:/!d;s/.*: //' $TMP_DIR/control) + homepage=$(sed '/^ *Homepage:/!d;s/.*: //' $TMP_DIR/control) + target="$(sed '/^ *Architecture:/!d;s/.*: //' $TMP_DIR/control)" case "$target" in i386|all) file="$package-$version" @@ -456,7 +455,7 @@ VERSION="$version" CATEGORY="misc" SHORT_DESC="$descrip" -WEB_SITE="http://packages.debian.org/search?keywords=$package" +WEB_SITE="${homepage:-http://packages.debian.org/search?keywords=$package}" MAINTAINER="nobody@slitaz.org" EOT LICENSE="$(grep /usr/share/common-licenses/ \