more wrapper svn functions

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@787 04377dda-e619-0410-9926-eae83683ac58

1 files changed, 10 insertions, 10 deletions

diff --git a/trunk/src/createpkg b/trunk/src/createpkg
index 08280a4..9563055 100644
--- a/trunk/src/createpkg
+++ b/trunk/src/createpkg
@@ -305,7 +305,7 @@ function repository_checkout {
 
 function repository_update {
 
-  if [ ! -z "$1" ] && [ -d "$1/.svn" ]; then
+  if [ ! -z "$1" ] && svn_folder $1; then
     echo "Fetching changes from svn repository for $1..."
     cwd="`pwd`"
     chown_svn $1 && chgrp_svn $1
@@ -319,14 +319,14 @@ function repository_status {
 
   local cwd
 
-  if [ -d "$PACKAGES_DIR/.svn" ]; then
+  if svn_folder $PACKAGES_DIR; then
     echo "Status of $PACKAGES_DIR."
     cwd="`pwd`"
     cd $PACKAGES_DIR && su_svn status
     cd $cwd
   fi
 
-  if [ -d "$NOARCH_DIR/.svn" ]; then
+  if svn_folder $NOARCH_DIR; then
     cwd="`pwd`"
     echo "Status of $NOARCH_DIR."
     cd $NOARCH_DIR && su_svn status
@@ -365,7 +365,7 @@ function create_repo_folder {
   if [ ! -d "$folder" ]; then
     echo "Creating packages folder $folder..."
     basedir="`dirname $folder`"
-    if [ -d "$basedir/.svn" ] && ! svn_check $folder; then
+    if svn_folder $basedir && ! svn_check $folder; then
       (
         cd $basedir
         chown_svn $basedir && chgrp_svn $basedir
@@ -375,7 +375,7 @@ function create_repo_folder {
       mkdir -p $folder/$SUBFOLDER
     fi
   elif [ ! -e $folder/$SUBFOLDER ]; then
-    if [ -d "$folder/.svn" ] && ! svn_check $folder/$SUBFOLDER; then
+    if svn_folder $folder && ! svn_check $folder/$SUBFOLDER; then
       (
         cd $folder
         chown_svn $folder && chgrp_svn $folder
@@ -413,7 +413,7 @@ function remove_old_package_data {
     fi
 
     # Using subversion
-    if [ -d "$makepkg_repos/.svn" ]; then
+    if svn_folder $makepkg_repos; then
 
       (
 
@@ -516,7 +516,7 @@ function sign_package {
 function create_package {
 
   # Synchronize repository
-  [ $SYNC -eq $yes ] && sync_repo $SLACKBUILDS_DIR $SLACKBUILDS_SVN
+  [ $SYNC -eq $yes ] && sync_svn_repo $SLACKBUILDS_DIR $SLACKBUILDS_SVN
   
   # Update keyring
   update_keyring $SLACKBUILDS_DIR/GPG-KEY
@@ -719,7 +719,7 @@ function create_package {
       mv $PACKAGES_DIR/$PKG_NAME.asc $NEW_REPOS/
     fi
   
-    if [ -d "$NEW_REPOS/.svn" ]; then
+    if svn_folder $NEW_REPOS; then
       (
         cd $NEW_REPOS
         chown_svn $PACKAGES_DIR && chgrp_svn $PACKAGES_DIR
@@ -850,7 +850,7 @@ fi
 BASENAME="`basename $0`[$CREATEPKG_CHILD]"
 
 check_config
-check_repo $SLACKBUILDS_DIR $SLACKBUILDS_SVN
+check_svn_repo $SLACKBUILDS_DIR $SLACKBUILDS_SVN
 
 INSTALL=$off
 NO_DEPS=$off
@@ -901,7 +901,7 @@ case $1 in
     build_queue $*
   ;;
   '--sync')
-    sync_repo $SLACKBUILDS_DIR $SLACKBUILDS_SVN
+    sync_svn_repo $SLACKBUILDS_DIR $SLACKBUILDS_SVN
     exit $EXIT_CODE
   ;;
   '--help'|'-h'|'')