mkslackbuild: versão 0.9.7 - simplifiquei o menu principal

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@194 04377dda-e619-0410-9926-eae83683ac58

diff --git a/trunk/conf/generic.mkSlackBuild.new b/trunk/conf/generic.mkSlackBuild.new
index e1998b0dd062b23f48cc39a70710dac29432049a..7f83d0eb1f1d5c4979ea247cded92b0739095922 100644 (file)
--- 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 825b3a7debb7fa56ffa2150cc083bf0e818e85bb..50867ad13b864a0f8dccd518a5e994780a4d9979 100755 (executable)
--- 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