From 35a965b84d3d09c261075c280e17b198151788eb Mon Sep 17 00:00:00 2001 From: rudson Date: Tue, 29 Apr 2008 14:02:11 +0000 Subject: git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@501 04377dda-e619-0410-9926-eae83683ac58 --- trunk/src/mkbuild | 60 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 24 deletions(-) (limited to 'trunk/src') diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild index 48b5c7f..1d4b693 100755 --- a/trunk/src/mkbuild +++ b/trunk/src/mkbuild @@ -293,7 +293,7 @@ function start_build { [ $# -ne 1 ] && handle_error $ERROR_PAR_NUMBER edit_file "SLACKBUILD AUTHOR" "$AUTHOR" $1 - edit_file "SLACKBUILD AUTHOR INITIALS" $AUTHOR_INITIALS $1 + edit_file "SLACKBUILD AUTHOR INITIALS" "$AUTHOR_INITIALS" $1 edit_file "SOURCE NAME" "$SRC_NAME" $1 edit_file "PROGRAM NAME" "$PKG_NAME" $1 edit_file "PACKAGE NAME" "$PKG_NAME" $1 @@ -306,7 +306,7 @@ function start_build { edit_file "ARCH" "$ARCH" $1 fi edit_file "NUMBER OF JOBS" "$NUMJOBS" $1 - edit_file "VERSION" $VERSION $1 + edit_file "VERSION" "$VERSION" $1 edit_file "SOURCE NAME CONSTRUCTION STRING" "$CONST_STRING" $1 edit_file "EXTENSION" "$EXTENSION" $1 edit_file "DOWNLOAD FOLDER URL" "$URL_BASE" $1 @@ -342,8 +342,7 @@ function set_status { [ $# -ne 3 ] && handle_error $ERROR_PAR_NUMBER if [ "`get_status $1 $3`" != "all" ]; then [ $VERBOSE -eq $on ] && echo "Section $1 $2" - eval "sed 's/^<$1>.*$/<$1> $2/' $3" > $AUX_TMP - mv $AUX_TMP $3 + eval "sed -i 's/^<$1>.*$/<$1> $2/' $3" else echo "Warning: Section $1 have status all. Can't change!" fi @@ -370,6 +369,15 @@ function activate_sections { set_status $SECTION $STATUS $SLACKBUILD_TEMP done + if [ $SVN_MOD -eq $on -o $URL == "none" ]; then + LIST_OFF="download_source md5sum_download_and_check_0 md5sum_download_and_check_1 gpg_signature_check untar_source" + [ $VERBOSE -eq $on ] && echo -e "\nSubversion or \"none\" URL changes:" + for i in $LIST_OFF; do + set_status $i "off" $SLACKBUILD_TEMP + done + [ $SVN_MOD -eq $on ] && set_status get_svn_source "on" $SLACKBUILD_TEMP + fi + } function build_slackbuild { @@ -691,6 +699,7 @@ COMMIT_SLACKBUILD=$off COMMIT_MKBUILD=$off # Set verbose off VERBOSE=$off +SVN_MOD=$off # Load /etc/simplepkg/simplepkg.conf parameters load_parameters @@ -753,8 +762,9 @@ if [ ! -z $MKBUILD_NAME ]; then # URL program URL=`validate_parameter "$URL" "DOWNLOAD FOLDER URL" ""` || handle_error $ERROR_MKBUILD_CONSTRUCTION "URL" [ $VERBOSE -eq $on ] && echo "[[URL]]=\"$URL\"" + [ $URL == "none" ] || echo $URL | grep '^svn:\/\/' >/dev/null && SVN_MOD=$on - STR_MOUNT="`echo $URL | rev | cut -c1-3 | rev | tr -d '.'`" + STR_MOUNT="`echo $URL | sed 's/.*\.\([a-z0-9]\+\)$/\1/'`" if [ $STR_MOUNT = "gz" -o $STR_MOUNT = "tgz" -o $STR_MOUNT = "bz2" -o $STR_MOUNT = "zip" ]; then SOURCE_NAME=`basename $URL` URL_BASE=`dirname $URL` @@ -763,22 +773,32 @@ if [ ! -z $MKBUILD_NAME ]; then fi [ $VERBOSE -eq $on ] && echo "[[DOWNLOAD FOLDER URL]]=\"$URL_BASE\"" - # Extension - EXTENSION=`validate_parameter "$EXTENSION" "EXTENSION" "$STR_MOUNT"` || handle_error $ERROR_MKBUILD_CONSTRUCTION "EXTENSION" - [ $VERBOSE -eq $on ] && echo "[[EXTENSION]]=\"$EXTENSION\"" + if [ $SVN_MOD -ne $on ]; then + # Extension + EXTENSION=`validate_parameter "$EXTENSION" "EXTENSION" "$STR_MOUNT"` || handle_error $ERROR_MKBUILD_CONSTRUCTION "EXTENSION" + [ $VERBOSE -eq $on ] && echo "[[EXTENSION]]=\"$EXTENSION\"" - BUILD_NUMBER=`validate_parameter "$BUILD_NUMBER" "BUILD NUMBER" "1"` || handle_error $ERROR_MKBUILD_CONSTRUCTION "BUILD NUMBER" + # Unpacker + UNPACKER=`validate_parameter "$UNPACKER" "UNPACKER" "tar"` || handle_error $ERROR_MKBUILD_CONSTRUCTION "UNPACKER" + [ $VERBOSE -eq $on ] && echo "[[UNPACKER]]=\"$UNPACKER\"" - # Unpacker - UNPACKER=`validate_parameter "$UNPACKER" "UNPACKER" "tar"` || handle_error $ERROR_MKBUILD_CONSTRUCTION "UNPACKER" - [ $VERBOSE -eq $on ] && echo "[[UNPACKER]]=\"$UNPACKER\"" + # Unpacker flags + [ "$UNPACKER" == "tar" ] && STR_MOUNT="--no-same-owner --no-same-permissions -xvf" || STR_MOUNT="" + UNPACKER_FLAGS=`validate_parameter "$UNPACKER_FLAGS" "UNPACKER FLAGS" "$STR_MOUNT"` || handle_error $ERROR_MKBUILD_CONSTRUCTION "UNPACKER FLAGS" + [ $VERBOSE -eq $on ] && echo "[[UNPACKER_FLAGS]]=\"$UNPACKER_FLAGS\"" - # Unpacker flags - [ "$UNPACKER" == "tar" ] && STR_MOUNT="--no-same-owner --no-same-permissions -xvf" || STR_MOUNT="" - UNPACKER_FLAGS=`validate_parameter "$UNPACKER_FLAGS" "UNPACKER FLAGS" "$STR_MOUNT"` || handle_error $ERROR_MKBUILD_CONSTRUCTION "UNPACKER FLAGS" - [ $VERBOSE -eq $on ] && echo "[[UNPACKER_FLAGS]]=\"$UNPACKER_FLAGS\"" + # Decompressor program and test flag + DECOMPRESSOR=`validate_parameter "$DECOMPRESSOR" "DECOMPRESSOR" ""` + [ -z $DECOMPRESSOR ] && decompress_find + [ $VERBOSE -eq $on ] && echo "[[DECOMPRESSOR]]=\"$DECOMPRESSOR\"" + + DECOMPRESSOR_TEST_FLAG=`validate_parameter "$DECOMPRESSOR_TEST_FLAG" "DECOMPRESSOR TEST FLAG" ""` || handle_error $ERROR_MKBUILD_CONSTRUCTION "DECOMPRESSOR TEST FLAG" + [ $VERBOSE -eq $on ] && echo "[[DECOMPRESSOR TEST FLAG]]=\"$DECOMPRESSOR_TEST_FLAG\"" + fi + BUILD_NUMBER=`validate_parameter "$BUILD_NUMBER" "BUILD NUMBER" "1"` || handle_error $ERROR_MKBUILD_CONSTRUCTION "BUILD NUMBER" # Build archteture + ARCH=`validate_parameter "$ARCH" "ARCH" "i486"` [ $VERBOSE -eq $on ] && echo "[[ARCH]]=\"$ARCH\"" @@ -805,14 +825,6 @@ if [ ! -z $MKBUILD_NAME ]; then [ -z $SOURCE_NAME ] && SOURCE_NAME=`eval "echo $CONST_STRING"` [ $VERBOSE -eq $on ] && echo "SOURCE_NAME=\"$SOURCE_NAME\"" - # Decompressor program and test flag - DECOMPRESSOR=`validate_parameter "$DECOMPRESSOR" "DECOMPRESSOR" ""` - [ -z $DECOMPRESSOR ] && decompress_find - [ $VERBOSE -eq $on ] && echo "[[DECOMPRESSOR]]=\"$DECOMPRESSOR\"" - - DECOMPRESSOR_TEST_FLAG=`validate_parameter "$DECOMPRESSOR_TEST_FLAG" "DECOMPRESSOR TEST FLAG" ""` || handle_error $ERROR_MKBUILD_CONSTRUCTION "DECOMPRESSOR TEST FLAG" - [ $VERBOSE -eq $on ] && echo "[[DECOMPRESSOR TEST FLAG]]=\"$DECOMPRESSOR_TEST_FLAG\"" - # Documentations list DOCFILES=`validate_parameter "$DOCFILES" "DOCUMENTATION FILES" "NEWS TODO README AUTHORS INSTALL ChangeLog MAINTAINERS COPYING LICENSE SIGNATURE readme.*"` [ $VERBOSE -eq $on ] && echo "[[DOCUMENTATION FILES]]=\"$DOCFILES\"" -- cgit v1.2.3