diff options
Diffstat (limited to 'trunk/src/mkbuild')
| -rwxr-xr-x | trunk/src/mkbuild | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild index 98d7b5c..951252e 100755 --- a/trunk/src/mkbuild +++ b/trunk/src/mkbuild @@ -558,14 +558,14 @@ function commit_slackbuild { # check path [ ! -e $SLACKBUILD_PATH ] && svn_mkdir $SLACKBUILD_PATH # add SlackBuild - svn_add $SLACKBUILD $SLACKBUILD_PATH + svn_copy $WORK/$SLACKBUILD $SLACKBUILD_PATH # check slack-required # add slack-required - [ -e $WORK/slack-required ] && svn_add slack-required $SLACKBUILD_PATH + [ -e $WORK/slack-required ] && svn_copy $WORK/slack-required $SLACKBUILD_PATH for i in `ls $WORK | egrep -v '(SlackBuild|old|slack-required|.mkbuild$|.tmp$)\*{0,1}$'`; do - svn_add `basename $i` $SLACKBUILD_PATH + svn_copy $WORK/$i $SLACKBUILD_PATH done cd $WORK @@ -594,34 +594,15 @@ function commit_mkbuild { # check path [ ! -e $MKBUILD_PATH ] && svn_mkdir $MKBUILD_PATH # add mkbuild - svn_add $MKBUILD_NAME $MKBUILD_PATH + svn_copy $WORK/$MKBUILD_NAME $MKBUILD_PATH for i in `ls $WORK | egrep -v '(SlackBuild|old|slack-required|.mkbuild$|.tmp$)\*{0,1}$'`; do - svn_add `basename $i` $MKBUILD_PATH + svn_copy $WORK/$i $MKBUILD_PATH done cd $WORK } -# TODO: merge with svn_add function from common.sh -function svn_add { - - # svn add file - [ $# -ne 2 ] && handle_error $ERROR_PAR_NUMBER - - # copy file - if [ -e $2/$1 ]; then - echo "$2/$1 exists. Overwrite it." - cp $WORK/$1 $2/ - else - cp $WORK/$1 $2/ - # add file to svn tree - chown_svn $2/$1 && chgrp_svn $2/$1 - su_svn add $2/$1 - fi - -} - # ---------------------------------------------------------------- # ------------------- general functions -------------------------- |