]> gitweb.fluxo.info Git - simplepkg.git/commitdiff
simplepkg 0.6pre16: mkbuild small fixes
authorrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Fri, 4 Jan 2008 20:44:44 +0000 (20:44 +0000)
committerrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Fri, 4 Jan 2008 20:44:44 +0000 (20:44 +0000)
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@482 04377dda-e619-0410-9926-eae83683ac58

trunk/simplepkg.SlackBuild
trunk/src/mkbuild

index a95f3853e24081078bcfec6af685dcc458bff43f..08a8db4f74fac49e1fcb101bdeefea1c19957ba8 100755 (executable)
@@ -18,7 +18,7 @@
 PACKAGE="simplepkg"
 PACK_DIR="package-$PACKAGE"
 BUILD=${BUILD:=1rha}
-VERSION="0.6pre15"
+VERSION="0.6pre16"
 ARCH="noarch"
 LIBEXEC="/usr/libexec/$PACKAGE"
 BINDIR="/usr/bin"
index 38cc78de9c46317a07b9afd1b611c90eb411f3a5..cddfa5d95a7f3761a0fb1052ef20360e7792ec76 100755 (executable)
@@ -616,7 +616,11 @@ function load_parameters {
 
     # Load Createpkg parameters
     SLACKBUILDS_DIR="`eval_parameter SLACKBUILDS_DIR /var/simplaret/slackbuilds`"
+    [ ! -d $SLACKBUILDS_DIR ] && mkdir -p $SLACKBUILDS_DIR
+
     MKBUILDS_DIR="`eval_parameter MKBUILDS_DIR /var/simplaret/mkbuilds`"
+    [ ! -d $SLACKBUILDS_DIR ] && mkdir -p $SLACKBUILDS_DIR
+
     SLACKBUILDS_SVN="`eval_parameter SLACKBUILDS_DIR svn://slack.sarava.org/slackbuilds`"
     MKBUILDS_SVN="`eval_parameter MKBUILDS_SVN svn://slack.sarava.org/mkbuilds`"
 
@@ -806,6 +810,7 @@ case $ACTION in
 
         # SlackBuild path
         # SlackBuild path in mkbuild parameters file
+        SLACKBUILD=${PKG_NAME}.SlackBuild
         SLACKBUILD_PATH=`get_slackbuild_path`
         [ $VERBOSE -eq $on ] && echo "[[SLACKBUILD PATH]]=\"$SLACKBUILD_PATH\""
 
@@ -813,7 +818,6 @@ case $ACTION in
         #-                   Start build SlackBuild                   -
         #--------------------------------------------------------------
         [ $VERBOSE -eq $on ] && echo -e "\nStart SlackBuild make"
-        SLACKBUILD=${PKG_NAME}.SlackBuild
         SLACKBUILD_TEMP=$SLACKBUILD.tmp
         cp $MODEL_DIR/$MODEL $SLACKBUILD_TEMP