From cca3e877217ae74258f894feef32159737d0d5dc Mon Sep 17 00:00:00 2001 From: rhatto Date: Mon, 1 Dec 2008 16:58:03 +0000 Subject: fix on su_svn git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@618 04377dda-e619-0410-9926-eae83683ac58 --- trunk/lib/common.sh | 6 +++++- trunk/src/mkbuild | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh index f1635e4..b242d29 100644 --- a/trunk/lib/common.sh +++ b/trunk/lib/common.sh @@ -659,7 +659,11 @@ function su_svn { # execute svn using a different user if [ ! -z "$SVN_USER" ]; then - su $SVN_USER -c "svn $*" + if [ "`whoami`" != "$SVN_USER" ]; then + su $SVN_USER -c "svn $*" + else + svn $* + fi else svn $* fi diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild index 4778869..c3a6fa2 100755 --- a/trunk/src/mkbuild +++ b/trunk/src/mkbuild @@ -567,7 +567,7 @@ function submit_slackbuild { # echo "Only root can submit SlackBuilds..." # return 1 #fi - echo -e "\nCommit $SLACKBUILD" + echo -e "\nSubmiting $SLACKBUILD" # check SlackBuilds directory [ ! -e $SLACKBUILDS_DIR ] && createpkg --sync @@ -600,7 +600,7 @@ function submit_mkbuild { # echo "Only root can submit mkbuild..." # return 1 #fi - echo -e "\nCommit $MKBUILD_NAME" + echo -e "\nSubmiting $MKBUILD_NAME" # check mkbuild directory [ ! -d $MKBUILDS_DIR ] && build_repo $MKBUILDS_DIR $MKBUILDS_SVN -- cgit v1.2.3