diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-27 23:31:24 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-27 23:31:24 +0000 |
| commit | 143a51b5d5689eb73cfb2a9080673646e04b9ee3 (patch) | |
| tree | 8e2f4c24ac62dfaae0d7418062e5635a8d09ed23 | |
| parent | cef62564549aaaded4e3135bffc181aa57c3151d (diff) | |
| download | simplepkg-143a51b5d5689eb73cfb2a9080673646e04b9ee3.tar.gz simplepkg-143a51b5d5689eb73cfb2a9080673646e04b9ee3.tar.bz2 | |
fixes
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@563 04377dda-e619-0410-9926-eae83683ac58
| -rw-r--r-- | trunk/lib/common.sh | 9 | ||||
| -rw-r--r-- | trunk/src/createpkg | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh index 93f1e0a..4b54cc6 100644 --- a/trunk/lib/common.sh +++ b/trunk/lib/common.sh @@ -566,16 +566,15 @@ function sync_repo { # $2 - svn address [ $# -ne 2 ] && exit 5 cd $1 - svn update || build_repo $1 $2 + su_svn update || build_repo $1 $2 } function svn_add { + # TODO: merge with svn_add function from mkbuild if [ -d "`dirname $1`/.svn" ] && ! svn_check $1; then - cwd="`pwd`" - cd `dirname $1` && svn add $1 - cd $cwd + su_svn add $1 fi } @@ -583,6 +582,8 @@ function svn_add { function svn_mkdir { # svn make directory + # usage: svn_mkdir <folder> + [ $# -ne 1 ] && handle_error $ERROR_PAR_NUMBER DIR_LIST=`echo $1 | tr '/' ' '` diff --git a/trunk/src/createpkg b/trunk/src/createpkg index 1ab48a6..49b3cfb 100644 --- a/trunk/src/createpkg +++ b/trunk/src/createpkg @@ -291,7 +291,7 @@ function repository_status { cd $cwd fi - mk_exit 0 + exit 0 } @@ -309,7 +309,7 @@ function commit_changes { cd $cwd fi - mk_exit 0 + exit 0 } @@ -326,7 +326,7 @@ if [ -f "$COMMON" ]; then source $COMMON else echo "error: file $COMMON found, check your $BASENAME installation" - mk_exit 0 + exit 0 fi set_constants |