diff options
author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-28 00:27:16 +0000 |
---|---|---|
committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-28 00:27:16 +0000 |
commit | 4ed659892de9efb0e7a898274ac33bf58572929f (patch) | |
tree | f0a1157e072383f607f9833af97de47dd7607c9f /trunk/lib | |
parent | 292a00b1207c07a6795ec0121a7a65eb56e02d9c (diff) | |
download | simplepkg-4ed659892de9efb0e7a898274ac33bf58572929f.tar.gz simplepkg-4ed659892de9efb0e7a898274ac33bf58572929f.tar.bz2 |
fixes
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@565 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/lib')
-rw-r--r-- | trunk/lib/common.sh | 60 |
1 files changed, 31 insertions, 29 deletions
diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh index faeaeb4..66c2725 100644 --- a/trunk/lib/common.sh +++ b/trunk/lib/common.sh @@ -514,12 +514,13 @@ function svn_check { cwd="`pwd`" folder="`dirname $1`" + file="`basename $1`" if [ -d "$folder/.svn" ]; then cd $folder - if [ "`svn status $1 | awk '{ print $1 }'`" == "?" ]; then + if [ "`svn status $file | awk '{ print $1 }'`" == "?" ]; then return 1 else return 0 @@ -623,6 +624,35 @@ function svn_mkdir { } +function su_svn { + + # execute svn using a different user + if [ ! -z "$SVN_USER" ]; then + su $SVN_USER -c "svn $*" + else + svn $* + fi + +} + +function chown_svn { + + # set svn folder ownership + if [ ! -z "$SVN_USER" ] && [ ! -z "$1" ]; then + chown -R $SVN_USER $1 + fi + +} + +function chgrp_svn { + + # set svn folder group + if [ ! -z "$SVN_GROUP" ] && [ ! -z "$1" ]; then + chgrp -R $SVN_GROUP $1 + fi + +} + # ----------------------------------------------- # update jail functions # ----------------------------------------------- @@ -1125,31 +1155,3 @@ function regexp_slash { } -function su_svn { - - # execute svn using a different user - if [ ! -z "$SVN_USER" ]; then - su $SVN_USER -c "svn $*" - else - svn $* - fi - -} - -function chown_svn { - - # set svn folder ownership - if [ ! -z "$SVN_USER" ] && [ ! -z "$1" ]; then - chown -R $SVN_USER $1 - fi - -} - -function chgrp_svn { - - # set svn folder group - if [ ! -z "$SVN_GROUP" ] && [ ! -z "$1" ]; then - chgrp -R $SVN_GROUP $1 - fi - -} |