createpkg-1.1.3: salva .slack-required no diretório de binários

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

diff --git a/trunk/src/createpkg b/trunk/src/createpkg
index 5b303fecbbeddb34762d53ff29404b4f650f07ce..4af0d55396cb2cdd7dce3e0a2c2637aefc95575f 100644 (file)
--- a/trunk/src/createpkg
+++ b/trunk/src/createpkg
@@ -31,7 +31,7 @@
 #               Createpkg functions
 #---------------------------------------------------
 
-CREATEPKG_VERSION="1.1.2"
+CREATEPKG_VERSION="1.1.3"
 
 function error_codes {
 
@@ -498,8 +498,13 @@ PKG_NAME="`ls -1 -c $MAKEPKG_REPOS/$PACKAGE-*-*-*.tgz | head -n 1 | xargs basena
 # Remove old packages from repository tree
 [ $REMOVE_OLD_PACKAGE -eq $on ] && rm $NEW_REPOS/$PACKAGE-*-*-*.tgz 2>/dev/null
 
-# Move package to SlackBuilds-like tree
-[ $MOVE_BIN_PACKAGE -eq $on ] && mv $MAKEPKG_REPOS/$PKG_NAME $NEW_REPOS/
+# Move package and slack-required to SlackBuilds-like tree
+if [ $MOVE_BIN_PACKAGE -eq $on ] then
+    mv $MAKEPKG_REPOS/$PKG_NAME $NEW_REPOS/
+    [ ! -z "$SLACK_REQUIRED" ] && cp $SLACK_REQUIRED $NEW_REPOS/$PKG_NAME.slack-required
+else
+    [ ! -z "$SLACK_REQUIRED" ] && cp $SLACK_REQUIRED $MAKEPKG_REPOS/$PKG_NAME.slack-required
+fi
 
 # Install package
 if [ "$INSTALL" -eq $on ]; then

diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild
index d02dbbd6cb7fdce201832c2684c0e15b744a4535..8dbd1c76f1ace49b55dba5015d92b417b8ceb780 100755 (executable)
--- a/trunk/src/mkbuild
+++ b/trunk/src/mkbuild
@@ -461,7 +461,7 @@ function commit_slackbuild {
 
     # Get SlackBuild path in slackbuild local tree
     if [ -z $SLACKBUILD_PATH ]; then
-        SLACKBUILD_PATH=`find $SLACKBUILDS_DIR -name $SLACKBUILD | xargs dirname`
+        SLACKBUILD_PATH=`find $SLACKBUILDS_DIR -name $SLACKBUILD | xargs dirname` 2>/dev/null
     fi
 
     # Get SlackBuild path in gentoo-portage tree