diff options
| -rw-r--r-- | trunk/Makefile | 2 | ||||
| -rw-r--r-- | trunk/mkbuild/generic.mkSlackBuild | 12 | ||||
| -rw-r--r-- | trunk/mkbuild/kde4.mkSlackBuild | 20 | ||||
| -rw-r--r-- | trunk/mkbuild/perl.mkSlackBuild | 24 | ||||
| -rw-r--r-- | trunk/mkbuild/python.mkSlackBuild | 20 |
5 files changed, 55 insertions, 23 deletions
diff --git a/trunk/Makefile b/trunk/Makefile index 7055dc9..2f55389 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -15,7 +15,7 @@ # PACKAGE = simplepkg -VERSION = $(shell echo '$$Rev$$' | sed -e 's/[^0-9]//g')_svn +VERSION = $(shell echo '$$Rev$$' | sed -e 's/[^0-9]//g')_svn_teste2 BUILD = 1rha PREFIX = /usr INSTALL = /usr/bin/install diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild index 03bc726..8d98026 100644 --- a/trunk/mkbuild/generic.mkSlackBuild +++ b/trunk/mkbuild/generic.mkSlackBuild @@ -214,6 +214,8 @@ else SIGNATURE="$SRC.sig" elif [ -s "$SRC_DIR/$SRC.asc" ]; then SIGNATURE="$SRC.asc" + elif [ -s "$SRC_DIR/$SRC.sign" ]; then + SIGNATURE="$SRC.sign" else echo Trying to get signature file from $URL.sig... if wget "$URL.sig" -O "$SRC_DIR/$SRC.sig"; then @@ -225,8 +227,14 @@ else SIGNATURE="$SRC.asc" else rm $SRC_DIR/$SRC.asc - echo "Error getting source's signature file" - exit $ERROR_GPG + echo Trying to get signature file from $URL.sign... + if wget "$URL.sign" -O "$SRC_DIR/$SRC.sign"; then + SIGNATURE="$SRC.sign" + else + rm $SRC_DIR/$SRC.sign + echo "Error getting source's signature file" + exit $ERROR_GPG + fi fi fi fi diff --git a/trunk/mkbuild/kde4.mkSlackBuild b/trunk/mkbuild/kde4.mkSlackBuild index 2003545..0052319 100644 --- a/trunk/mkbuild/kde4.mkSlackBuild +++ b/trunk/mkbuild/kde4.mkSlackBuild @@ -195,12 +195,14 @@ if echo [[SIGNING URL]] | grep -q -v "SIGNING URL"; then SIGNATURE="`basename [[SIGNING URL]]`" if [ ! -s "$SRC_DIR/$SIGNATURE" ]; then wget "[[SIGNING URL]]" -O "$SRC_DIR/$SIGNATURE" || exit $ERROR_WGET - fi + fi else if [ -s "$SRC_DIR/$SRC.sig" ]; then SIGNATURE="$SRC.sig" elif [ -s "$SRC_DIR/$SRC.asc" ]; then SIGNATURE="$SRC.asc" + elif [ -s "$SRC_DIR/$SRC.sign" ]; then + SIGNATURE="$SRC.sign" else echo Trying to get signature file from $URL.sig... if wget "$URL.sig" -O "$SRC_DIR/$SRC.sig"; then @@ -212,11 +214,17 @@ else SIGNATURE="$SRC.asc" else rm $SRC_DIR/$SRC.asc - echo "Error getting source's signature file" - exit $ERROR_GPG - fi - fi - fi + echo Trying to get signature file from $URL.sign... + if wget "$URL.sign" -O "$SRC_DIR/$SRC.sign"; then + SIGNATURE="$SRC.sign" + else + rm $SRC_DIR/$SRC.sign + echo "Error getting source's signature file" + exit $ERROR_GPG + fi + fi + fi + fi fi echo Checking $SRC_DIR/$SRC with gpg using $SRC_DIR/$SIGNATURE... diff --git a/trunk/mkbuild/perl.mkSlackBuild b/trunk/mkbuild/perl.mkSlackBuild index 8a6a88b..9e07195 100644 --- a/trunk/mkbuild/perl.mkSlackBuild +++ b/trunk/mkbuild/perl.mkSlackBuild @@ -156,12 +156,14 @@ if echo [[SIGNING URL]] | grep -q -v "SIGNING URL"; then SIGNATURE="`basename [[SIGNING URL]]`" if [ ! -s "$SRC_DIR/$SIGNATURE" ]; then wget "[[SIGNING URL]]" -O "$SRC_DIR/$SIGNATURE" || exit $ERROR_WGET - fi + fi else - if [ -f "$SRC_DIR/$SRC.sig" ]; then + if [ -s "$SRC_DIR/$SRC.sig" ]; then SIGNATURE="$SRC.sig" - elif [ -f "$SRC_DIR/$SRC.asc" ]; then + elif [ -s "$SRC_DIR/$SRC.asc" ]; then SIGNATURE="$SRC.asc" + elif [ -s "$SRC_DIR/$SRC.sign" ]; then + SIGNATURE="$SRC.sign" else echo Trying to get signature file from $URL.sig... if wget "$URL.sig" -O "$SRC_DIR/$SRC.sig"; then @@ -173,11 +175,17 @@ else SIGNATURE="$SRC.asc" else rm $SRC_DIR/$SRC.asc - echo "Error getting source's signature file" - exit $ERROR_GPG - fi - fi - fi + echo Trying to get signature file from $URL.sign... + if wget "$URL.sign" -O "$SRC_DIR/$SRC.sign"; then + SIGNATURE="$SRC.sign" + else + rm $SRC_DIR/$SRC.sign + echo "Error getting source's signature file" + exit $ERROR_GPG + fi + fi + fi + fi fi echo Checking $SRC_DIR/$SRC with gpg using $SRC_DIR/$SIGNATURE... diff --git a/trunk/mkbuild/python.mkSlackBuild b/trunk/mkbuild/python.mkSlackBuild index 144d6cc..46fec30 100644 --- a/trunk/mkbuild/python.mkSlackBuild +++ b/trunk/mkbuild/python.mkSlackBuild @@ -208,12 +208,14 @@ if echo [[SIGNING URL]] | grep -q -v "SIGNING URL"; then SIGNATURE="`basename [[SIGNING URL]]`" if [ ! -s "$SRC_DIR/$SIGNATURE" ]; then wget "[[SIGNING URL]]" -O "$SRC_DIR/$SIGNATURE" || exit $ERROR_WGET - fi + fi else if [ -s "$SRC_DIR/$SRC.sig" ]; then SIGNATURE="$SRC.sig" elif [ -s "$SRC_DIR/$SRC.asc" ]; then SIGNATURE="$SRC.asc" + elif [ -s "$SRC_DIR/$SRC.sign" ]; then + SIGNATURE="$SRC.sign" else echo Trying to get signature file from $URL.sig... if wget "$URL.sig" -O "$SRC_DIR/$SRC.sig"; then @@ -225,11 +227,17 @@ else SIGNATURE="$SRC.asc" else rm $SRC_DIR/$SRC.asc - echo "Error getting source's signature file" - exit $ERROR_GPG - fi - fi - fi + echo Trying to get signature file from $URL.sign... + if wget "$URL.sign" -O "$SRC_DIR/$SRC.sign"; then + SIGNATURE="$SRC.sign" + else + rm $SRC_DIR/$SRC.sign + echo "Error getting source's signature file" + exit $ERROR_GPG + fi + fi + fi + fi fi echo Checking $SRC_DIR/$SRC with gpg using $SRC_DIR/$SIGNATURE... |