From 02c35be015c168aa9ad36cb328b29f23b38dd437 Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Wed, 3 Sep 2008 23:56:27 +0000
Subject: merging with changes made since 21th May

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@514 04377dda-e619-0410-9926-eae83683ac58
---
 trunk/src/createpkg | 41 ++++++++++++++++-------------------------
 1 file changed, 16 insertions(+), 25 deletions(-)

(limited to 'trunk/src/createpkg')

diff --git a/trunk/src/createpkg b/trunk/src/createpkg
index 1dd568e..cf8e515 100644
--- a/trunk/src/createpkg
+++ b/trunk/src/createpkg
@@ -27,7 +27,7 @@
 #               Createpkg functions
 #---------------------------------------------------
 
-CREATEPKG_VERSION="1.1.13"
+CREATEPKG_VERSION="1.1.15"
 
 function usage {
 
@@ -308,7 +308,10 @@ case $1 in
   ;;
   '--search'|'-s')
     [ $# -ne 2 ] && usage   # two parameters is required
-    find_slackbuild $2
+    LIST=`find_slackbuild $2`
+    for i in $LIST; do
+        echo $i | sed 's/.*\/\([^\/]\+\)\.[Ss]lack[Bb]uild$/  \1/'
+    done
     exit $EXIT_CODE
   ;;
   '--info'|'-f')
@@ -424,29 +427,17 @@ eecho $messag "$BASENAME: processing $SCRIPT_NAME"
 cd $SCRIPT_BASE
 
 # Run SlackBuild script
-if [ $DEBUG -eq $off ]; then
-  (
-    LANG=en_US \
-    SRC_DIR=${SRC_DIR:=$SOURCE_DIR} \
-    SRC=${SRC_DIR:=$SOURCE_DIR} \
-    ARCH=${ARCH:=$CREATE_ARCH} \
-    COLOR=${COLOR:=$COLOR_MODE} \
-    REPOS=${REPOS:=$MAKEPKG_REPOS} \
-    CLEANUP=${CLEANUP:=$CREATE_CLEANUP} \
-    INTERACT=no sh +x ./$SCRIPT_NAME
-  )
-else
-  (
-    LANG=en_US \
-    SRC_DIR=${SRC_DIR:=$SOURCE_DIR} \
-    SRC=${SRC_DIR:=$SOURCE_DIR} \
-    ARCH=${ARCH:=$CREATE_ARCH} \
-    COLOR=${COLOR:=$COLOR_MODE} \
-    REPOS=${REPOS:=$MAKEPKG_REPOS} \
-    CLEANUP=${CLEANUP:=$CREATE_CLEANUP} \
-    INTERACT=no sh -x ./$SCRIPT_NAME
-  )
-fi
+[ $DEBUG -eq $off ] && SHELL_FLAG="+x" || SHELL_FLAG="-x"
+(
+  LANG=en_US \
+  SRC_DIR=${SRC_DIR:=$SOURCE_DIR} \
+  SRC=${SRC_DIR:=$SOURCE_DIR} \
+  ARCH=${ARCH:=$CREATE_ARCH} \
+  COLOR=${COLOR:=$COLOR_MODE} \
+  REPOS=${REPOS:=$MAKEPKG_REPOS} \
+  CLEANUP=${CLEANUP:=$CREATE_CLEANUP} \
+  INTERACT=no sh $SHELL_FLAG ./$SCRIPT_NAME
+)
 
 # Check if package was built
 handle_error $? $PACKAGE
-- 
cgit v1.2.3