diff options
Diffstat (limited to 'scripts/makeworld')
| -rwxr-xr-x | scripts/makeworld | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/scripts/makeworld b/scripts/makeworld index 9b5e46cd..ce634071 100755 --- a/scripts/makeworld +++ b/scripts/makeworld @@ -1,7 +1,7 @@ #!/bin/bash toplevel=`pwd` -version="2.3.2" +version="2.4" usage() { echo "makeworld version $version" @@ -29,23 +29,31 @@ fi MAKEPKG_OPTS= for arg in $*; do case $arg in - -c|--clean) - MAKEPKG_OPTS="$MAKEPKG_OPTS -c" + --clean) MAKEPKG_OPTS="$MAKEPKG_OPTS -c" ;; + --install) MAKEPKG_OPTS="$MAKEPKG_OPTS -i" ;; + --syncdeps) MAKEPKG_OPTS="$MAKEPKG_OPTS -s" ;; + --builddeps) MAKEPKG_OPTS="$MAKEPKG_OPTS -b" ;; + --nodeps) MAKEPKG_OPTS="$MAKEPKG_OPTS -d" ;; + --force) MAKEPKG_OPTS="$MAKEPKG_OPTS -f" ;; + --*) + usage + exit 1 ;; - -i|--install) - MAKEPKG_OPTS="$MAKEPKG_OPTS -i" - ;; - -s|--syncdeps) - MAKEPKG_OPTS="$MAKEPKG_OPTS -d" - ;; - -b|--builddeps) - MAKEPKG_OPTS="$MAKEPKG_OPTS -b" - ;; - -d|--nodeps) - MAKEPKG_OPTS="$MAKEPKG_OPTS -n" - ;; - -f|--force) - MAKEPKG_OPTS="$MAKEPKG_OPTS -f" + -*) + while getopts "cisbdf-" opt; do + case $opt in + c) MAKEPKGS_OPTS="$MAKEPKGS_OPTS -c" ;; + i) MAKEPKGS_OPTS="$MAKEPKGS_OPTS -i" ;; + s) MAKEPKGS_OPTS="$MAKEPKGS_OPTS -s" ;; + b) MAKEPKGS_OPTS="$MAKEPKGS_OPTS -b" ;; + d) MAKEPKGS_OPTS="$MAKEPKGS_OPTS -d" ;; + f) MAKEPKGS_OPTS="$MAKEPKGS_OPTS -f" ;; + -) + OPTIND=0 + break + ;; + esac + done ;; *) dest=$arg @@ -73,13 +81,10 @@ for category in $*; do . PKGBUILD buildstatus=0 if [ ! -f $dest/$pkgname-$pkgver-$pkgrel.pkg.tar.gz ]; then - makepkg $MAKEPKG_OPTS 2>>$toplevel/makepkg.log + makepkg $MAKEPKG_OPTS -w $dest 2>>$toplevel/makepkg.log if [ $? -gt 0 ]; then buildstatus=2 else - rm -rf pkg src - # some packages (mozilla) have been split into multiple packages - mv -v $pkgname-*.pkg.tar.gz $dest/ buildstatus=1 fi fi |