From 316be7696a4d1112328a346e49b50f1cb0c6290b Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Thu, 27 Nov 2008 22:23:38 +0000
Subject: adding user and group support for svn management

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

(limited to 'trunk/src')

diff --git a/trunk/src/createpkg b/trunk/src/createpkg
index e465e58..fe52d4f 100644
--- a/trunk/src/createpkg
+++ b/trunk/src/createpkg
@@ -257,6 +257,8 @@ function load_parameters {
   SOURCE_DIR="`eval_parameter SOURCE_DIR /var/simplepkg/sources`"
   SLACKBUILDS_DIR="`eval_parameter SLACKBUILDS_DIR /var/simplepkg/slackbuilds`"
   SLACKBUILDS_SVN="`eval_parameter SLACKBUILDS_SVN http://slack.sarava.org/slackbuilds`"
+  SVN_USER="`eval_parameter MAKEPKG_SVN_USER`"
+  SVN_GROUP="`eval_parameter MAKEPKG_SVN_GROUP`"
 
   COLOR_MODE="`eval_parameter COLOR_MODE none`"
   CREATE_ARCH="`eval_parameter CREATE_ARCH $(default_arch)`"
@@ -272,7 +274,8 @@ function repository_update {
 
   if [ -d "$MAKEPKG_REPOS/.svn" ]; then
     cwd="`pwd`"
-    cd $MAKEPKG_REPOS && svn update
+    chown_svn $MAKEPKG_REPOS && chgrp_svn $MAKEPKG_REPOS
+    cd $MAKEPKG_REPOS && su_svn update
     cd $cwd
   fi
 
@@ -284,7 +287,7 @@ function repository_status {
 
   if [ -d "$MAKEPKG_REPOS/.svn" ]; then
     cwd="`pwd`"
-    cd $MAKEPKG_REPOS && svn status
+    cd $MAKEPKG_REPOS && su_svn status
     cd $cwd
   fi
 
@@ -296,11 +299,12 @@ function commit_changes {
 
   if [ -d "$MAKEPKG_REPOS/.svn" ]; then
     cwd="`pwd`"
+    chown_svn $MAKEPKG_REPOS && chgrp_svn $MAKEPKG_REPOS
     cd $MAKEPKG_REPOS
     if [ ! -z "$1" ]; then
-      svn commit -m $*
+      su_svn commit -m $*
     else
-      svn commit
+      su_svn commit
     fi
     cd $cwd
   fi
@@ -526,7 +530,8 @@ if [ ! -e $NEW_REPOS ]; then
   if [ -d "$MAKEPKG_REPOS/.svn" ] && ! svn_check $NEW_REPOS; then
     cwd="`pwd`"
     cd $MAKEPKG_REPOS
-    svn add $( echo ${SCRIPT_BASE#$SLACKBUILDS_DIR/} )
+    chown_svn $MAKEPKG_REPOS && chgrp_svn $MAKEPKG_REPOS
+    su_svn add $( echo ${SCRIPT_BASE#$SLACKBUILDS_DIR/} )
     cd $cwd
   fi
 fi
@@ -561,7 +566,8 @@ if [ $REMOVE_OLD_PACKAGE -eq $on ]; then
         if [ "`package_version $file`" != "$PACKAGE_VERSION" ] || \
            [ "`package_arch $file`" != "$PACKAGE_ARCH" ] || \
            [ "`package_build $file`" != "$PACKAGE_BUILD" ]; then
-          svn del --force $file
+           chown_svn $MAKEPKG_REPOS && chgrp_svn $MAKEPKG_REPOS
+           su_svn del --force $file
         fi
       else
         rm $file
@@ -570,10 +576,11 @@ if [ $REMOVE_OLD_PACKAGE -eq $on ]; then
 
     for file in `find $MAKEPKG_REPOS -name "$PACKAGE.slack-required"`; do
       if svn_check $file; then
+        chown_svn $MAKEPKG_REPOS && chgrp_svn $MAKEPKG_REPOS
         if [ $MOVE_SLACK_REQUIRED -eq $off ]; then
-          svn del --force $file
+          su_svn del --force $file
         elif [ ! -z "$SLACK_REQUIRED" ] && [ "$NEW_REPOS/$PACKAGE.slack-required" != "$file" ]; then
-          svn del --force $file
+          su_svn del --force $file
         fi
       else
         rm $file
@@ -596,7 +603,8 @@ if [ $MOVE_BIN_PACKAGE -eq $on ]; then
   if [ -d "$NEW_REPOS/.svn" ]; then
     cwd="`pwd`"
     cd $NEW_REPOS
-    svn add $PKG_NAME
+    chown_svn $MAKEPKG_REPOS && chgrp_svn $MAKEPKG_REPOS
+    su_svn add $PKG_NAME
     cd $cwd
   fi
 
@@ -607,7 +615,8 @@ if [ $MOVE_BIN_PACKAGE -eq $on ]; then
       if [ -d "$NEW_REPOS/.svn" ] && ! svn_check $NEW_REPOS/$PACKAGE.slack-required; then
         cwd="`pwd`"
         cd $NEW_REPOS
-        svn add $PACKAGE.slack-required
+        chown_svn $MAKEPKG_REPOS && chgrp_svn $MAKEPKG_REPOS
+        su_svn add $PACKAGE.slack-required
         cd $cwd
       fi
     fi
diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild
index 40a0e27..efc3adc 100755
--- a/trunk/src/mkbuild
+++ b/trunk/src/mkbuild
@@ -613,7 +613,9 @@ function svn_mkdir {
   DIR=""
   for i in $DIR_LIST; do
     DIR=$DIR/$i
-    [ ! -e ${DIR:1} ] && svn mkdir ${DIR:1}
+    if [ ! -e ${DIR:1} ]; then
+      su_svn mkdir ${DIR:1}
+    fi
   done
 
 }
@@ -630,7 +632,8 @@ function svn_add {
   else
     cp $WORK/$1 $2/
     # add file to svn tree
-    svn add $2/$1
+    chown_svn $2/$1 && chgrp_svn $2/$1
+    su_svn add $2/$1
   fi
 
 }
@@ -690,6 +693,8 @@ function load_parameters {
 
   SLACKBUILDS_SVN="`eval_parameter SLACKBUILDS_DIR http://slack.sarava.org/slackbuilds`"
   MKBUILDS_SVN="`eval_parameter MKBUILDS_SVN http://slack.sarava.org/mkbuilds`"
+  SVN_USER="`eval_parameter MKBUILDS_SVN_USER`"
+  SVN_GROUP="`eval_parameter MKBUILDS_SVN_GROUP`"
 
   COLOR_MODE="`eval_parameter COLOR_MODE none`"
 
-- 
cgit v1.2.3