# HG changeset patch # User Christopher Rogers # Date 1302528193 0 # Node ID ce6ee9d737753bb5ac972ba55698af6dc775149a # Parent 3baad9f857a2df6ae70d4663b786235f9a277345 Fixed slitaz-modular script to only remove packages-order.txt if CLEAN_MODULES_DIR equals yes. Also made sure to add old code in mkiso.sh script into slitaz-modular script to remove modules folders if CLEAN_MODULES_DIR equals yes. diff -r 3baad9f857a2 -r ce6ee9d73775 initramfs/usr/bin/slitaz-modular --- a/initramfs/usr/bin/slitaz-modular Mon Apr 11 12:32:30 2011 +0000 +++ b/initramfs/usr/bin/slitaz-modular Mon Apr 11 13:23:13 2011 +0000 @@ -254,8 +254,10 @@ touch $SGNFILE - [ -f $ISODIR/packages-order.txt ] && rm -f $ISODIR/packages-order.txt - touch $ISODIR/packages-order.txt + if [ "$CLEAN_MODULES_DIR" = "yes" ]; then + [ -f $ISODIR/packages-order.txt ] && rm -f $ISODIR/packages-order.txt + touch $ISODIR/packages-order.txt + fi if [ "$CLEAN_INITRAMFS" = "yes" ]; then if [ -d ${INITRAMFS} ]; then @@ -281,6 +283,11 @@ if [ ! $(grep "^$d$" $ISODIR/packages-order.txt) ]; then [ -d $MODULES_DIR/$d ] || mkdir -p $MODULES_DIR/$d [ -f $MODULES_DIR/$d/receipt ] && continue + if [ "$CLEAN_MODULES_DIR" = "yes" ]; then + if [ -d $MODULES_DIR/$d ]; then + rm -Rf $MODULES_DIR/$d + fi + fi info "Make module of depend package $i" echo "$d" >> $ISODIR/packages-order.txt cd $MODULES_DIR/$d @@ -292,6 +299,11 @@ if [ ! $(grep "^$i$" $ISODIR/packages-order.txt) ]; then [ -d $MODULES_DIR/$i ] || mkdir -p $MODULES_DIR/$i [ -f $MODULES_DIR/$i/receipt ] && continue + if [ "$CLEAN_MODULES_DIR" = "yes" ]; then + if [ -d $MODULES_DIR/$i ]; then + rm -Rf $MODULES_DIR/$i + fi + fi echo "$i" >> $ISODIR/packages-order.txt info "Make module of main package $i" cd $MODULES_DIR/$i