diff options
| -rwxr-xr-x | trunk/src/mkbuild | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild index e79b023..7f9ea7b 100755 --- a/trunk/src/mkbuild +++ b/trunk/src/mkbuild @@ -539,7 +539,7 @@ function get_slackbuild_path { [ -z $AUX_PATH ] && AUX_PATH=`validate_parameter "$SLACKBUILD_PATH" "SLACKBUILD PATH" ""` # SlackBuild path in SlackBuild tree - [ -z $AUX_PATH ] && AUX_PATH=`find $SLACKBUILDS_DIR -name $SLACKBUILD | xargs dirname` 2>/dev/null + [ -z $AUX_PATH ] && AUX_PATH=`cd $SLACKBUILDS_DIR && find . -name $SLACKBUILD | sed -e 's/^\.\///' | xargs dirname` 2>/dev/null # SlackBuild path default [ -z $AUX_PATH ] && AUX_PATH="others/unclassified/$PKG_NAME" @@ -580,15 +580,6 @@ function submit_slackbuild { # check path [ ! -e $SLACKBUILD_PATH ] && svn_mkdir $SLACKBUILD_PATH - # remove stuff in old places - for candidate in `find . -name $SLACKBUILD`; do - oldplace="`dirname $candidate | sed -e 's/^\.\///'`" - if [ "$oldplace" != "`dirname $SLACKBUILD_PATH | sed -e 's/^\.\///'`" ]; then - echo "Removing SlackBuild found at old path $oldplace" - svn_del $oldplace - fi - done - # add SlackBuild svn_copy $WORK/$SLACKBUILD $SLACKBUILD_PATH @@ -600,6 +591,15 @@ function submit_slackbuild { svn_copy $WORK/$i $SLACKBUILD_PATH done + # remove stuff in old places + for candidate in `find . -name $SLACKBUILD`; do + oldplace="`dirname $candidate | sed -e 's/^\.\///'`" + if [ "$oldplace" != "$SLACKBUILD_PATH" ]; then + echo "Removing SlackBuild found at old path $oldplace" + svn_del $oldplace + fi + done + cd $WORK } @@ -624,21 +624,22 @@ function submit_mkbuild { # check path [ ! -e $MKBUILD_PATH ] && svn_mkdir $MKBUILD_PATH + # add mkbuild + svn_copy $WORK/$MKBUILD_NAME $MKBUILD_PATH + + for i in `ls $WORK | egrep -v '(SlackBuild|old|slack-required|.mkbuild$|.tmp$)\*{0,1}$'`; do + svn_copy $WORK/$i $MKBUILD_PATH + done + # remove stuff in old places for candidate in `find . -name $MKBUILD_NAME`; do oldplace="`dirname $candidate | sed -e 's/^\.\///'`" - if [ "$oldplace" != "`dirname $MKBUILD_PATH | sed -e 's/^\.\///'`" ]; then + if [ "$oldplace" != "$MKBUILD_PATH" ]; then echo "Removing mkbuild found at old path $oldplace" svn_del $oldplace fi done - # add mkbuild - svn_copy $WORK/$MKBUILD_NAME $MKBUILD_PATH - - for i in `ls $WORK | egrep -v '(SlackBuild|old|slack-required|.mkbuild$|.tmp$)\*{0,1}$'`; do - svn_copy $WORK/$i $MKBUILD_PATH - done cd $WORK } |