diff options
| -rw-r--r-- | trunk/conf/generic.mkSlackBuild.new | 2 | ||||
| -rwxr-xr-x | trunk/utils/mkslackbuild | 46 |
2 files changed, 25 insertions, 23 deletions
diff --git a/trunk/conf/generic.mkSlackBuild.new b/trunk/conf/generic.mkSlackBuild.new index e1998b0..7f83d0e 100644 --- a/trunk/conf/generic.mkSlackBuild.new +++ b/trunk/conf/generic.mkSlackBuild.new @@ -106,7 +106,7 @@ gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG <untar_source> all # Untar -cd "$SRC_DIR" +cd "$TMP" tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR cd "$PKG_SRC" diff --git a/trunk/utils/mkslackbuild b/trunk/utils/mkslackbuild index 825b3a7..50867ad 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.6 +# Version 0.9.7 # #-------------------------------------------------------------------- # Functions @@ -727,7 +727,7 @@ function exec_script() # turn off debug set +x # Start variables -PROG_VERSION=0.9.6 +PROG_VERSION=0.9.7 LANG=us BASEDIR=`pwd` AUX_TMP=`mktemp -p /tmp/ aux_tmp.XXXXXX` @@ -785,18 +785,18 @@ while [ $ANS0 -ne 0 ]; do --cancel-label "Exit" --menu "Main Menu:" 0 0 0 \ "1" "Create New SlackBuild" \ "2" "Open MkSlackBuild" \ - "3" "Save MkSlackBuild" \ - "4" "Make Slackbuild" \ - "5" "Edit SlackBuild Sections" \ - "6" "Edit Dependency List" \ - "7" "Test SlackBuild Script" \ - "8" "View Doc-Files" \ - "0" "Exit"` + "3" "Edit SlackBuild Sections" \ + "4" "Edit Dependency List" \ + "5" "Test SlackBuild Script" \ + "6" "View Doc-Files" \ + "0" "Exit and Save..."` +# "3" "Save MkSlackBuild" \ +# "4" "Make Slackbuild" \ EXIT_STATUS=$? fi if [ $EXIT_STATUS -ne 0 ]; then - mk_exit $EXIT_STATUS + ANS0=0 fi case $ANS0 in @@ -808,22 +808,22 @@ while [ $ANS0 -ne 0 ]; do open_mkslackbuild [ $? -eq 100 ] && MK_PKGNAME="" ;; +# 3) +# save_mkslackbuild +# ;; +# 4) +# mount_slackbuild +# ;; 3) - save_mkslackbuild - ;; - 4) - mount_slackbuild - ;; - 5) edit_menu ;; - 6) + 4) edit_dependency ;; - 7) + 5) test_menu ;; - 8) + 6) view_docs ;; *) @@ -834,9 +834,11 @@ done if [ ! -z $MK_PKGNAME ]; then MKSLACKBUILD=$BASEDIR/$MK_PKGNAME.mkslackbuild - if [ ! -e $MKSLACKBUILD ]; then - save_mkslackbuild - fi + save_mkslackbuild + mount_slackbuild +# if [ ! -e $MKSLACKBUILD ]; then +# save_mkslackbuild +# fi fi mk_exit 0 |