cookutils rev 530 slitaz-tank
libcookiso.sh: Fixed gen_flavor and get_flavor.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Sat Aug 25 23:12:06 2012 +0000 (2012-08-25) |
parents | 39f3a73df0ea |
children | 9f88765a5bce |
files | lib/libcookiso.sh |
line diff
1.1 --- a/lib/libcookiso.sh Sat Aug 25 09:30:31 2012 +0000 1.2 +++ b/lib/libcookiso.sh Sat Aug 25 23:12:06 2012 +0000 1.3 @@ -678,7 +678,7 @@ 1.4 for pkg in $(cat $DISTRO/list-packages) 1.5 do 1.6 echo -n "Installing package: $pkg" 1.7 - yes y | tazpkg install $pkg --root=$ROOTFS 2>&1 >> $log || exit 1 1.8 + yes y | tazpkg install $pkg --root=$ROOTFS 2>/dev/null >> $log || exit 1 1.9 status 1.10 done 1.11 rm -f $ROOTFS/$DB/packages.* 1.12 @@ -742,7 +742,7 @@ 1.13 mkdir ${ROOTFS}0$n 1.14 cd $PACKAGES_REPOSITORY 1.15 yes y | tazpkg install-list \ 1.16 - $DISTRO/list-packages0$n --root=${ROOTFS}0$n 1.17 + $DISTRO/list-packages0$n --root=${ROOTFS}0$n 2>/dev/null 1.18 rm -rf ${ROOTFS}0$n/boot ${ROOTFS}0$n/$DB/packages.* 1.19 status 1.20 cd $DISTRO 1.21 @@ -781,7 +781,8 @@ 1.22 } 1.23 1.24 # tazlito gen-flavor 1.25 -gen_flavor( 1.26 +gen_flavor() 1.27 +{ 1.28 # Generate a new flavor from the last iso image generated. 1.29 FLAVOR=${1%.flavor} 1.30 newline 1.31 @@ -844,7 +845,7 @@ 1.32 get_flavor() 1.33 { 1.34 # Get a flavor's files and prepare for gen-distro. 1.35 - FLAVOR=${2%.flavor} 1.36 + FLAVOR=${1%.flavor} 1.37 echo -e "\n\033[1mPreparing $FLAVOR distro flavor\033[0m" 1.38 separator 1.39 if [ -f $FLAVOR.flavor ] || download $FLAVOR.flavor; then