From 292a00b1207c07a6795ec0121a7a65eb56e02d9c Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Thu, 27 Nov 2008 23:51:27 +0000
Subject: minor cleanup

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

(limited to 'trunk/src')

diff --git a/trunk/src/createpkg b/trunk/src/createpkg
index 49b3cfb..42c4043 100644
--- a/trunk/src/createpkg
+++ b/trunk/src/createpkg
@@ -611,14 +611,7 @@ if [ $MOVE_BIN_PACKAGE -eq $on ]; then
   # Move package's slack-required to binary repository
   if [ $MOVE_SLACK_REQUIRED -eq $on ]; then
     if [ ! -z "$SLACK_REQUIRED" ]; then
-      cp $SLACK_REQUIRED $NEW_REPOS/$PACKAGE.slack-required
-      if [ -d "$NEW_REPOS/.svn" ] && ! svn_check $NEW_REPOS/$PACKAGE.slack-required; then
-        cwd="`pwd`"
-        cd $NEW_REPOS
-        chown_svn $MAKEPKG_REPOS && chgrp_svn $MAKEPKG_REPOS
-        su_svn add $PACKAGE.slack-required
-        cd $cwd
-      fi
+      svn_copy $SLACK_REQUIRED $NEW_REPOS/$PACKAGE.slack-required
     fi
   fi
 
diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild
index 98d7b5c..951252e 100755
--- a/trunk/src/mkbuild
+++ b/trunk/src/mkbuild
@@ -558,14 +558,14 @@ function commit_slackbuild {
   # check path
   [ ! -e $SLACKBUILD_PATH ] && svn_mkdir $SLACKBUILD_PATH
   # add SlackBuild
-  svn_add $SLACKBUILD $SLACKBUILD_PATH
+  svn_copy $WORK/$SLACKBUILD $SLACKBUILD_PATH
 
   # check slack-required
   # add slack-required
-  [ -e $WORK/slack-required ] && svn_add slack-required $SLACKBUILD_PATH
+  [ -e $WORK/slack-required ] && svn_copy $WORK/slack-required $SLACKBUILD_PATH
 
   for i in `ls $WORK | egrep -v '(SlackBuild|old|slack-required|.mkbuild$|.tmp$)\*{0,1}$'`; do
-    svn_add `basename $i` $SLACKBUILD_PATH
+    svn_copy $WORK/$i $SLACKBUILD_PATH
   done
 
   cd $WORK
@@ -594,34 +594,15 @@ function commit_mkbuild {
   # check path
   [ ! -e $MKBUILD_PATH ] && svn_mkdir $MKBUILD_PATH
   # add mkbuild
-  svn_add $MKBUILD_NAME $MKBUILD_PATH
+  svn_copy $WORK/$MKBUILD_NAME $MKBUILD_PATH
 
   for i in `ls $WORK | egrep -v '(SlackBuild|old|slack-required|.mkbuild$|.tmp$)\*{0,1}$'`; do
-    svn_add `basename $i` $MKBUILD_PATH
+    svn_copy $WORK/$i $MKBUILD_PATH
   done
   cd $WORK
 
 }
 
-# TODO: merge with svn_add function from common.sh
-function svn_add {
-
-  # svn add file
-  [ $# -ne 2 ] && handle_error $ERROR_PAR_NUMBER
-
-  # copy file
-  if [ -e $2/$1 ]; then
-    echo "$2/$1 exists. Overwrite it."
-    cp $WORK/$1 $2/
-  else
-    cp $WORK/$1 $2/
-    # add file to svn tree
-    chown_svn $2/$1 && chgrp_svn $2/$1
-    su_svn add $2/$1
-  fi
-
-}
-
 # ----------------------------------------------------------------
 # ------------------- general functions --------------------------
 
-- 
cgit v1.2.3