From eb8940033560aea1d56ac7c34eea0de0af620635 Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Fri, 9 May 2008 00:44:40 +0000
Subject: fixed svn_source on generic model

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@510 04377dda-e619-0410-9926-eae83683ac58
---
 trunk/doc/CHANGELOG                |  1 +
 trunk/mkbuild/generic.mkSlackBuild | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'trunk')

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index 6b24ccf..f9c5be0 100644
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -5,6 +5,7 @@ simplepkg changelog
 ========
 
     - using Makefile instead of simplepkg.SlackBuild
+    - generic.mkSlackBuild: fix on svn_source
     - createpkg 1.1.12:
       - change indentation do two spaces;
       - add option --debug|-d to debug SlackBuilds scripts;
diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild
index 19fd8dd..133c851 100644
--- a/trunk/mkbuild/generic.mkSlackBuild
+++ b/trunk/mkbuild/generic.mkSlackBuild
@@ -117,11 +117,17 @@ fi
 
 <svn_source> off
 # Get svn source code
-[ "`find "$SRC_DIR/" -name .svn`" != "" ] && SVN_ACTION="update" || SVN_ACTION="checkout"
 cd "$SRC_DIR"
-svn $SVN_ACTION [[DOWNLOAD FOLDER URL]] $PKG_SRC || exit $ERROR_VCS
-SND_DIR="`ls -l | awk '/^d/ { print $NF }'`"
-cd $SND_DIR
+SND_DIR="`basename [[DOWNLOAD FOLDER URL]]`"
+
+if [ "`find "$SRC_DIR/" -name .svn`" != "" ] && [ -d "$SRC_DIR/$SND_DIR" ]; then
+  cd $SND_DIR
+  svn update || exit $ERROR_VCS
+else
+  svn checkout [[DOWNLOAD FOLDER URL]] $SND_DIR || exit $ERROR_VCS
+  cd $SND_DIR
+fi
+
 PKG_VERSION="`svn info | awk '/Last Changed Rev:/ { print $4 }'`_svn"
 
 # Copy svn source
-- 
cgit v1.2.3