From b8d012423843db3b4f9643d243c7c935641cda6e Mon Sep 17 00:00:00 2001
From: rudson <rudson@04377dda-e619-0410-9926-eae83683ac58>
Date: Sat, 3 Mar 2007 22:40:07 +0000
Subject: mkbuild-0.9.13: permite trabalhar com diferentes modelos de
 SlaclBuild

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@202 04377dda-e619-0410-9926-eae83683ac58
---
 trunk/utils/mkbuild | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'trunk')

diff --git a/trunk/utils/mkbuild b/trunk/utils/mkbuild
index b0544c1..ee664ea 100755
--- a/trunk/utils/mkbuild
+++ b/trunk/utils/mkbuild
@@ -12,8 +12,8 @@
 # Turn off debug
 set +x
 #
-# Version 0.9.12
-PROG_VERSION=0.9.12
+# Version 0.9.13
+PROG_VERSION=0.9.13
 
 #--------------------------------------------------------------------
 # Functions
@@ -383,7 +383,7 @@ function start_build()
     change_strings "OTHER CONFIGURE ARGS" "$MK_OPTIONS"
     change_strings "DOCUMENTATION FILES" "$MK_DOCFILES"
     change_strings "PREFIX" "$MK_PREFIX"
-    #change_strings "MD5SUM EXTENSION" "$MK_MD5SUM_EXT"
+    #[ ! -z $MK_MD5SUM_EXT ] && change_strings "MD5SUM EXTENSION" "$MK_MD5SUM_EXT"
 }
 
 # Mount final SlackBuild
@@ -897,15 +897,16 @@ AUX_TMP=`mktemp -p  /tmp/ aux_tmp.XXXXXX`
 SLACKDESC_TMP=`mktemp -p  /tmp/ slackdesc_tmp.XXXXXX`
 SLACKDESC_LEN=77
 DEPENDENCY_LIST=`mktemp -p  /tmp/ slack-required.XXXXXX`
-if [ -e ~/.generic.mkSlackBuild ]; then
-    SB_MODEL=~/.generic.mkSlackBuild
-elif [ -e /etc/simplepkg/generic.mkSlackBuild ]; then
-    SB_MODEL=/etc/simplepkg/generic.mkSlackBuild
-else
-    echo "SlackBuild model (generic.mkSlackBuild) not found"
-    mk_exit 0
+if [ -z $SB_MODEL ]; then
+    if [ -e ~/.generic.mkSlackBuild ]; then
+        SB_MODEL=~/.generic.mkSlackBuild
+    elif [ -e /etc/simplepkg/generic.mkSlackBuild ]; then
+        SB_MODEL=/etc/simplepkg/generic.mkSlackBuild
+    else
+        echo "SlackBuild model (generic.mkSlackBuild) not found"
+        mk_exit 0
+    fi
 fi
-
 [ $# -ne 0 ] && MKSLACKBUILD=$1
 
 # Clear dialog
@@ -923,14 +924,13 @@ MK_EDITOR=[[EDITOR]]
 MK_LIMITRATE="120k"
 MK_SOURCEDIR=\`pwd\`
 MK_ARCH="i468"
-#MK_URL="ftp://localhost"
+#SB_MODEL="my_model"
 EOF
 )
 fi
 source ~/.mkslackbuild
 MK_SOURCEDIR=${MK_SOURCEDIR:=$BASEDIR}
 MK_ARCH=${MK_ARCH:="i486"}
-#MK_MD5SUM_EXT="md5sum"
 
 # Config Author
 if [ "$MK_AUTHOR" = "[[AUTHOR NAME]]" ]; then
-- 
cgit v1.2.3