aboutsummaryrefslogtreecommitdiff
path: root/trunk/mkbuild
diff options
context:
space:
mode:
authorrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2008-05-09 00:44:40 +0000
committerrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2008-05-09 00:44:40 +0000
commiteb8940033560aea1d56ac7c34eea0de0af620635 (patch)
tree508283c9dcb908781bba10061b40d9482ac2dc57 /trunk/mkbuild
parent2d594bc3d8bdb56803bee31456b1ff69dde031b9 (diff)
downloadsimplepkg-eb8940033560aea1d56ac7c34eea0de0af620635.tar.gz
simplepkg-eb8940033560aea1d56ac7c34eea0de0af620635.tar.bz2
fixed svn_source on generic model
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@510 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/mkbuild')
-rw-r--r--trunk/mkbuild/generic.mkSlackBuild14
1 files changed, 10 insertions, 4 deletions
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