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

diff --git a/trunk/Makefile b/trunk/Makefile
index 749c492ce685c205544cb6e2a0e5b4cdac63c606..3dd668e1e2084e96e388d95b1f468df41b17ca55 100644 (file)
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -14,13 +14,13 @@
 #  Place - Suite 330, Boston, MA 02111-1307, USA
 #
 
-VERSION = 0.6pre27
+VERSION = 0.6pre28
 BUILD = 1rha
 PREFIX = /usr
 INSTALL = /usr/bin/install
 
 clean:
-       rm -f *~ # clean local backups
+       find . -name *~ | xargs rm -f # clean local backups
 
 install_lib:
        $(INSTALL) -D --mode=0644 lib/common.sh $(DESTDIR)/$(PREFIX)/libexec/simplepkg/common.sh

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index f9c5be0384506d9ad4d7e844eeb9c3a9a8a82d27..d82622ad36ca6f0c7f5f46ec5b54c33ff8408a76 100644 (file)
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -1,6 +1,16 @@
 simplepkg changelog
 ===================
 
+0.6pre28
+========
+
+    - mkbuild 1.2.7:
+      - new ACTION bugfix
+      - search result bugfix
+    - createpkg 1.1.13:
+      - severals EXIT_CODE corrections
+      - search result bugfix
+
 0.6pre27
 ========
 

diff --git a/trunk/src/createpkg b/trunk/src/createpkg
index 93c658ddb8facc42d55fe28d7b6d5479065f1135..ce85a9c09980cf78bcb90e863ec9453e628277d9 100644 (file)
--- a/trunk/src/createpkg
+++ b/trunk/src/createpkg
@@ -27,7 +27,7 @@
 #               Createpkg functions
 #---------------------------------------------------
 
-CREATEPKG_VERSION="1.1.12"
+CREATEPKG_VERSION="1.1.13"
 
 function usage {
 
@@ -161,8 +161,9 @@ function find_slackbuild {
 
   # Find SlackBuild script in the repository
   [ $# -ne 1 ] && handle_error $ERROR_PAR_NUMBER
-  find $SLACKBUILDS_DIR -iname $1.SlackBuild
-  EXIT_CODE=$?
+  OUTPUT=`find $SLACKBUILDS_DIR -iname $1.SlackBuild`
+  [ "$OUTPUT" =! "" ] && EXIT_CODE=0 || EXIT_CODE=1
+  echo $OUTPUT
 }
 
 function info_builds {
@@ -303,18 +304,18 @@ case $1 in
   '--all'|'-a')
     # build all SlackBuilds in repository
     build_all_slackbuild
-    exit 0
+    exit $EXIT_CODE
   ;;
   '--search'|'-s')
     [ $# -ne 2 ] && usage   # two parameters is required
     find_slackbuild $2
-    exit 0
+    exit $EXIT_CODE
   ;;
   '--info'|'-f')
     [ $# -ne 2 ] && usage   # two parameters is required
     PKG_PATH=`find_slackbuild $2`
     info_builds
-  exit 0
+  exit $EXIT_CODE
   ;;
   '--install'|'-i')
     [ $# -ne 2 ] && usage   # two parameters is required
@@ -333,15 +334,15 @@ case $1 in
   ;;
   '--sync')
     sync_repo $SLACKBUILDS_DIR $SLACKBUILDS_SVN
-    exit 0
+    exit $EXIT_CODE
   ;;
   '--help'|'-h'|'')
     usage
-    exit 0
+    exit $EXIT_CODE
   ;;
   '--list'|'-l')
     list_builds
-    exit 0
+    exit $EXIT_CODE
   ;;
   *)
     if [ "${1:0:1}" != "-" ]; then

diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild
index e55dfb4181c32a4225bf5e67525d607b5d7e3620..d961a530f39fdc7047cb5e76b9a7e73864baf8ed 100755 (executable)
--- a/trunk/src/mkbuild
+++ b/trunk/src/mkbuild
@@ -19,7 +19,7 @@
 # Based in model generic.SlackBuild of Luiz
 #
 # Version:
-PROG_VERSION=1.2.6
+PROG_VERSION=1.2.7
 PROG_NAME=`basename $0`
 
 #--------------------------------------------------------------------
@@ -263,7 +263,7 @@ function set_parameters {
     shift
   done
 
-  [ ! -e $MKBUILD_NAME ] && ACTION='new'
+  [ ! -e $MKBUILD_NAME -a $ACTION == "build" ] && ACTION='new'
 
 }
 
@@ -929,8 +929,13 @@ if [ ! -z $MKBUILD_NAME ]; then
       [ $COMMIT_MKBUILD -eq $on ] && commit_mkbuild
     ;;
     'search')
-      find $MKBUILDS_DIR -iname $MKBUILD_NAME
-      EXIT_CODE=$?
+      SEARCH=`find $MKBUILDS_DIR -iname $MKBUILD_NAME`
+      if [ "$SEARCH" == "" ]; then
+        EXIT_CODE=1
+      else
+        EXIT_CODE=0
+        echo $SEARCH
+      fi
     ;;
   esac
 fi