From cef62564549aaaded4e3135bffc181aa57c3151d Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Thu, 27 Nov 2008 23:11:47 +0000
Subject: fixes

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@562 04377dda-e619-0410-9926-eae83683ac58
---
 trunk/src/createpkg |  4 ++--
 trunk/src/mkbuild   | 20 ++------------------
 2 files changed, 4 insertions(+), 20 deletions(-)

(limited to 'trunk/src')

diff --git a/trunk/src/createpkg b/trunk/src/createpkg
index fe52d4f..1ab48a6 100644
--- a/trunk/src/createpkg
+++ b/trunk/src/createpkg
@@ -526,12 +526,12 @@ PKG_NAME="`ls -1 -c $MAKEPKG_REPOS/$PACKAGE-*-*-*.tgz | head -n 1 | xargs basena
 
 # Create repository directory
 if [ ! -e $NEW_REPOS ]; then
-  mkdir -p $NEW_REPOS || mkdir -p $NEW_REPOS
+  mkdir -p $NEW_REPOS
   if [ -d "$MAKEPKG_REPOS/.svn" ] && ! svn_check $NEW_REPOS; then
     cwd="`pwd`"
     cd $MAKEPKG_REPOS
     chown_svn $MAKEPKG_REPOS && chgrp_svn $MAKEPKG_REPOS
-    su_svn add $( echo ${SCRIPT_BASE#$SLACKBUILDS_DIR/} )
+    svn_mkdir $( echo ${SCRIPT_BASE#$SLACKBUILDS_DIR/} )
     cd $cwd
   fi
 fi
diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild
index efc3adc..98d7b5c 100755
--- a/trunk/src/mkbuild
+++ b/trunk/src/mkbuild
@@ -603,23 +603,7 @@ function commit_mkbuild {
 
 }
 
-function svn_mkdir {
-
-  # svn make directory
-  [ $# -ne 1 ] && handle_error $ERROR_PAR_NUMBER
-
-  DIR_LIST=`echo $1 | tr '/' ' '`
-
-  DIR=""
-  for i in $DIR_LIST; do
-    DIR=$DIR/$i
-    if [ ! -e ${DIR:1} ]; then
-      su_svn mkdir ${DIR:1}
-    fi
-  done
-
-}
-
+# TODO: merge with svn_add function from common.sh
 function svn_add {
 
   # svn add file
@@ -627,7 +611,7 @@ function svn_add {
 
   # copy file
   if [ -e $2/$1 ]; then
-    echo "$2/$1 exist. Overwriter it."
+    echo "$2/$1 exists. Overwrite it."
     cp $WORK/$1 $2/
   else
     cp $WORK/$1 $2/
-- 
cgit v1.2.3