diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2009-01-15 15:23:23 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2009-01-15 15:23:23 +0000 |
| commit | 7a9a77f408711dbc28b3c9120fde47d7fdd694d3 (patch) | |
| tree | 5a787edc6ea9ac455b3cce49985497e6b965c368 /trunk/src | |
| parent | 74912bb1eb1076a1b6a6ffac18886f51f0a2885a (diff) | |
| download | simplepkg-7a9a77f408711dbc28b3c9120fde47d7fdd694d3.tar.gz simplepkg-7a9a77f408711dbc28b3c9120fde47d7fdd694d3.tar.bz2 | |
attemting to fix 64
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@743 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/src')
| -rwxr-xr-x | trunk/src/mkbuild | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild index d705929..fdee5ed 100755 --- a/trunk/src/mkbuild +++ b/trunk/src/mkbuild @@ -643,25 +643,22 @@ function submit_mkbuild { local candidate oldplace - # check mkbuild directory + # Check mkbuild directory [ ! -d $MKBUILDS_DIR ] && build_repo $MKBUILDS_DIR $MKBUILDS_SVN # Get mkbuild path in parameter file MKBUILD_PATH=$SLACKBUILD_PATH - # change to mkbuilds directory + # Change to mkbuilds directory cd $MKBUILDS_DIR/ - # Add mkbuild scripts - # check path + # Check path [ ! -e $MKBUILD_PATH ] && svn_mkdir $MKBUILD_PATH - # add mkbuild - svn_copy $WORK/`basename $MKBUILD_NAME` $MKBUILD_PATH - - for i in `ls $WORK | grep -E -v '(SlackBuild|old|slack-required|.mkbuild$|.tmp$)\*{0,1}$'`; do + # Add relevant files + for i in `ls $WORK | grep -E -v '(SlackBuild|old|slack-required|.tmp$)\*{0,1}$'`; do if [ "`basename $i`" != "$DIST_SRC_NAME" ]; then - if ! is_the_same $(dirname $MKBUILD_PATH) $WORK; then + if ! is_the_same $MKBUILD_PATH $WORK; then svn_copy $WORK/$i $MKBUILD_PATH else svn_add $WORK/$i @@ -669,7 +666,7 @@ function submit_mkbuild { fi done - # remove stuff in old places + # Remove stuff in old places for candidate in $(find . -name $(basename $MKBUILD_NAME)); do oldplace="`dirname $candidate | sed -e 's/^\.\///'`" if [ "$oldplace" != "$MKBUILD_PATH" ]; then @@ -685,8 +682,8 @@ function submit_mkbuild { function submit_cleanup { - # remove files that should not be stored at the mkbuilds repository - if ! is_the_same $(dirname $MKBUILD_PATH) $WORK; then + # Remove files that should not be stored at the mkbuilds repository + if is_the_same $MKBUILD_PATH $WORK; then ( cd $WORK rm -f *.old *.tmp *.SlackBuild slack-required $DIST_SRC_NAME |