From 246475541fd2d6cb4a5e96010191f2ebaf841a23 Mon Sep 17 00:00:00 2001 From: rudson Date: Thu, 29 Nov 2007 17:45:13 +0000 Subject: mkbuild-1.1.9: Alguns bugfixes para atenter as entrada de parâmetros no mkbuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@460 04377dda-e619-0410-9926-eae83683ac58 --- trunk/doc/CHANGELOG | 73 +++++++++++++++++++++++++++++++++++++++++---- trunk/mkbuild/model.mkbuild | 2 +- trunk/src/mkbuild | 22 ++++++++------ 3 files changed, 81 insertions(+), 16 deletions(-) diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG index 74a8992..c00c572 100644 --- a/trunk/doc/CHANGELOG +++ b/trunk/doc/CHANGELOG @@ -1,10 +1,71 @@ simplepkg changelog =================== +0.6pre1-10 + + - simplepkg.conf: + - new config variables: + - MKBUILDS_DIR (mkbuilds directory repository) + - SLACKBUILDS_SVN (SlackBuild svn source) + - MKBUILDS_SVN (Mkbuild svn source) + + - common.sh: + - added error_codes function + - added handle_error function + - added svn functions: + - build_repo (build a svn repository) + - check_repo (check repository) + - sync_repo (synchronize repository) + - added is_number function. + Check if input is a number + + - generic.mkSlackBuild: + - added variable PKG_WORK(=$TMP/$SRC_NAME) to package work directory + - PKG_SRC now is `ls -la | awk '/^d/ { print $8 }'`, directory in $PKG_WORK + + - model.mkbuild: + - Some changes to integrate to applicatory the external ones: + - [[SLACKBUILD AUTHOR]] default change to "[[YOUR NAME]]" + - [[SLACKBUILD AUTHOR INITIALLS]] default change to "[[YOUR SIGNATURE]]" + - [[DONLOAD FOLDER URL]] default change to "[[DEFAULT URL]][[PACKGE NAME]]" + - all [[NAME]] change to [[PACKGE NAME]] + - added [[ARCH]]="" parameter + + - createpkg-1.1.8: + - moved handle_error and error_codes to common.sh (see above) + - usage function add exit program + - change ERROR_... codes to ERROR_CREATEPKG_... + - added SLACKBUILDS_SVN variable + - called to svn functions change to send SLACKBUILDS_DIR and SLACKBUILDS_SVN variables + - error 2 (usage function) change to usage function call + + - lspkg: + - added error code 1 to fail exit + + - mkbuild-1.1.8: + - added commit mkbuild, commit slackbuild , and commit all options + - removed error_codes and mkbuild_error to common.sh + - COMMIT variable change to COMMIT_SLACKBUILD + - added variable COMMIT_MKBUILD + - analysis of the variable NUMJOBS moved close to the reading from parameter NUMBJOBS + - reading of the variable SLACKBUILD_PATH was moved for the end of the list of parameters + - is_number function moved to common.sh + - added validate_parameter input check + - added support to the "empty parameter" in validate_parameter function + - added variables SLACKBUILDS_SVN, MKBUILDS_DIR and MKBUILDS_SVN + - added variables BASENAME (program name) + - COMMIT_SLACKBUILD and COMMIT_MKBUILD default set to off + - UNPACKER bugfix + - DECOMPRESSOR bugfix + - added most flexibility in the creation of initial ".mkbuild" file + - added commit_mkbuild function + - bugfix: input of set_parameters ($@) protected with "" + - bugfixes: -a, -u, and -ai options + 0.6pre1-8 ========= - - common.sh: + - common.sh: - fixed http://slack.sarava.org/trac/ticket/19 - added simpletrack script @@ -114,7 +175,7 @@ simplepkg changelog - jail-commit - SILENT env variable to decrease verbosity - + 0.5pre4 ======= @@ -250,7 +311,7 @@ simplepkg changelog - simplaret: - config evaluation via common.sh - new config parameter SIMPLARET_PURGE_PATCHES - + 0.4.9pre7 ========= @@ -289,7 +350,7 @@ simplepkg changelog - now with slackbuild error handling - increased verbosity - - small fixes on rebuildpkg + - small fixes on rebuildpkg - lspkg enhancements @@ -390,11 +451,11 @@ simplepkg changelog - multi-plataform and version management - now simplepkg supports jails with architectures and versions + now simplepkg supports jails with architectures and versions others than the main system, read the docs for details. - added simplaret: a small script for downloading packages - + - jail-upgrade * arch checking via /etc/slackware-version on each jail diff --git a/trunk/mkbuild/model.mkbuild b/trunk/mkbuild/model.mkbuild index 1e7fa69..ee2bb99 100644 --- a/trunk/mkbuild/model.mkbuild +++ b/trunk/mkbuild/model.mkbuild @@ -12,7 +12,7 @@ #------------------------ # # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... ) -[[DOWNLOAD FOLDER URL]]="[[DEFAULT URL]]/[[PACKAGE NAME]]/" +[[DOWNLOAD FOLDER URL]]="[[DEFAULT URL]]" # Source base name. if different from package name. Null ("") to default value. # Auto-set, get SRC_NAME from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION' diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild index fa8f828..2ff2435 100755 --- a/trunk/src/mkbuild +++ b/trunk/src/mkbuild @@ -18,8 +18,8 @@ # # Based in model generic.SlackBuild of Luiz # -# Version 1.1.8 -PROG_VERSION=1.1.8 +# Version 1.1.9 +PROG_VERSION=1.1.9 PROG_NAME=`basename $0` #-------------------------------------------------------------------- @@ -107,7 +107,6 @@ function set_parameters { # Use: set_parameters $@ # where $@ are the parameters input # - # Parameters analyze while [ "$1" ]; do case $1 in @@ -651,18 +650,23 @@ error_codes [ $# -eq 0 ] && mkbuild_use && exit 1 # Configure input parameters -set_parameters $@ +set_parameters "$@" [ $VERBOSE -eq $on ] && echo -e "$PROG_NAME version $PROG_VERSION\n" -if [ ! -z $MKBUILD_NAME ]; then +if [ ! -z "$MKBUILD_NAME" ]; then # Create a new .mkbuild parameters-file cp $MODEL_DIR/model.mkbuild ${MKBUILD_NAME}.mkbuild # Package Author - [ -z $AUTHOR ] && edit_file "YOUR NAME" "${AUTHOR}" ${MKBUILD_NAME}.mkbuild - # Package Author Signature - [ -z $AUTHOR_INITIAL ] && edit_file "YOUR SIGNATURE" "${AUTHOR_INITIAL}" ${MKBUILD_NAME}.mkbuild + if [ ! -z "$AUTHOR" ]; then + edit_file "YOUR NAME" "${AUTHOR}" ${MKBUILD_NAME}.mkbuild + # Package Author Signature + if [ -z "$AUTHOR_INITIALS" ]; then + AUTHOR_INITIALS=`echo $AUTHOR | tr '[A-Z]' '[a-z]' | sed 's/ /\n/g' | sed 's/^\([a-z]\).*/\1/' | sed ':i ; $! N ; s/\n// ; t i'` + fi + edit_file "YOUR SIGNATURE" "${AUTHOR_INITIALS}" ${MKBUILD_NAME}.mkbuild + fi # Change Default SourceForge URL - [ -z $URL ] && URL="http://downloads.sourceforge.net/[[PACKAGE NAME]]" + [ -z "$URL" ] && URL="http://downloads.sourceforge.net/[[PACKAGE NAME]]/" edit_file "DEFAULT URL" "${URL}" ${MKBUILD_NAME}.mkbuild # Change Package Name edit_file "PACKAGE NAME" "${MKBUILD_NAME}" ${MKBUILD_NAME}.mkbuild -- cgit v1.2.3