diff options
Diffstat (limited to 'trunk')
| -rwxr-xr-x | trunk/utils/mkbuild | 26 |
1 files changed, 13 insertions, 13 deletions
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 |