diff options
Diffstat (limited to 'trunk')
| -rw-r--r-- | trunk/conf/generic.mkSlackBuild.new | 4 | ||||
| -rwxr-xr-x | trunk/utils/mkslackbuild | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/trunk/conf/generic.mkSlackBuild.new b/trunk/conf/generic.mkSlackBuild.new index f874433..e1998b0 100644 --- a/trunk/conf/generic.mkSlackBuild.new +++ b/trunk/conf/generic.mkSlackBuild.new @@ -32,12 +32,12 @@ ARCH=${ARCH:=[[ARCH]]} SRC_VERSION=${VERSION:=[[VERSION]]} PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')" BUILD=${BUILD:=1[[SLACKBUILD AUTHOR INITIALS]]} -SRC_DIR=${SRC_DIR:=$CWD} +SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME TMP=${TMP:=/tmp} PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=[[PREFIX]]} -PKG_SRC="$SRC_DIR/$SRC_NAME-$SRC_VERSION" +PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION" </set_variables> <slkflags> all diff --git a/trunk/utils/mkslackbuild b/trunk/utils/mkslackbuild index e23bdba..825b3a7 100755 --- a/trunk/utils/mkslackbuild +++ b/trunk/utils/mkslackbuild @@ -9,7 +9,7 @@ # Slackbuilds são scripts utilizados no Slackware para gerar # pacotes tgz. # -# Version 0.9.5 +# Version 0.9.6 # #-------------------------------------------------------------------- # Functions @@ -308,14 +308,14 @@ function view_docs() { local MENU="" local SELECT="" + local ANS2=0 for i in $DOC_FILES; do MENU="$MENU \"$i\" \"\" " done - ANS2=0 while [ $ANS2 -eq 0 ]; do - SELECT=`eval "dialog --stdout --backtitle \"mkSlackBuild $PROG_VERSION [$MK_PKGNAME]\" --title \" Documentations files \" --menu \"Select doc-file below:\" 20 45 13 $MENU"` + SELECT=`eval "dialog --stdout --backtitle \"mkSlackBuild $PROG_VERSION [$MK_PKGNAME]\" --cancel-label \"Continue\" --title \" Documentations files \" --menu \"Select doc-file below:\" 20 45 13 $MENU"` ANS2=$? [ $ANS2 -eq 0 ] && view_file "File: $SELECT" $MK_TMPSRC/$SELECT done @@ -650,7 +650,7 @@ function edit_menu() EDITMENU="$EDITMENU ${SECTION_NAME[i]} ${SECTION_FLAG[i]}" done - SELECT=`eval "dialog --stdout --backtitle \"mkSlackBuild $PROG_VERSION [$MK_PKGNAME]\" --cancel-label \"Main Menu\" --menu \"Select one section to edit\" 20 40 13 $EDITMENU"` + SELECT=`eval "dialog --stdout --backtitle \"mkSlackBuild $PROG_VERSION [$MK_PKGNAME]\" --ok-label \"Edit\" --cancel-label \"Main Menu\" --menu \"Select one section to edit\" 20 40 13 $EDITMENU"` ANSE=$? if [ $ANSE -ne 1 ]; then STATUS=`mk_status $SELECT` @@ -727,7 +727,7 @@ function exec_script() # turn off debug set +x # Start variables -PROG_VERSION=0.9.5 +PROG_VERSION=0.9.6 LANG=us BASEDIR=`pwd` AUX_TMP=`mktemp -p /tmp/ aux_tmp.XXXXXX` @@ -787,7 +787,7 @@ while [ $ANS0 -ne 0 ]; do "2" "Open MkSlackBuild" \ "3" "Save MkSlackBuild" \ "4" "Make Slackbuild" \ - "5" "Edit Script Sections" \ + "5" "Edit SlackBuild Sections" \ "6" "Edit Dependency List" \ "7" "Test SlackBuild Script" \ "8" "View Doc-Files" \ |