From 8ded2051d2449045ad07117d7ac58a17784d20ef Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 20 Mar 2007 19:16:17 +0000 Subject: * TODO.dan updates. Alessio 'mOLOk' Bolognino * Make makeworld compatable with makepkg lacking -w option. --- TODO.dan | 3 +++ scripts/makeworld | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/TODO.dan b/TODO.dan index 7af3e684..70e08295 100644 --- a/TODO.dan +++ b/TODO.dan @@ -24,6 +24,9 @@ keep, etc. Good python script in the forums that we should try to emulate. Downgrade feature - allow users to see cached packages and downgrade to (previous or any?) available options. +Installed size and download size in -Si/Qi output should scale with package +size- KB to MB to GB. We should also get consistancy of K/KB, M/MB, etc. + Extreme similarity between some of the sync and add code...we have to be able to abstract more away from sync actions and add actions to just 'actions' (example: sync,c, add.c, and deptest.c all contain a switch on PM_DEP_MOD_*). diff --git a/scripts/makeworld b/scripts/makeworld index 7fe84bad..b9d318c6 100755 --- a/scripts/makeworld +++ b/scripts/makeworld @@ -131,20 +131,20 @@ if [ "$dest" = "" ]; then fi # convert a (possibly) relative path to absolute -cd $dest -dest=$(pwd) +cd "$dest" +dest="$(pwd)" cd - &>/dev/null sd=$(date +"[%b %d %H:%M]") for category in $*; do - for port in $(find $toplevel/$category -maxdepth 1 -mindepth 1 -type d | sort); do + for port in $(find "$toplevel/$category" -maxdepth 1 -mindepth 1 -type d | sort); do cd $port if [ -f PKGBUILD ]; then . PKGBUILD buildstatus=0 - if [ ! -f $dest/$pkgname-$pkgver-$pkgrel.pkg.tar.gz ]; then - makepkg $MAKEPKG_OPTS -m -w $dest 2>>$toplevel/makepkg.log + if [ ! -f "$dest/$pkgname-$pkgver-$pkgrel.pkg.tar.gz" ]; then + PKGDEST="$dest" makepkg $MAKEPKG_OPTS -m 2>>$toplevel/makepkg.log if [ $? -gt 0 ]; then buildstatus=2 else -- cgit v1.2.3-70-g09d2