SliTaz Repositories

     1.1 --- a/mkiso.sh	Fri Oct 14 05:47:23 2011 +0000
     1.2 +++ b/mkiso.sh	Fri Oct 14 05:52:47 2011 +0000
     1.3 @@ -145,7 +145,7 @@
     1.4  	info "Making bootable image"
     1.5  	[ -f $LOG/initramfs.log ] && rm -f $LOG/initramfs.log
     1.6  	cat "$BASEDIR/initramfs/initramfs.list" | grep -v "^#" | while read pkgname; do
     1.7 -		if [ ! -f ${INITRAMFS}/var/lib/tazpkg/installed/${pkgname}/files.list ]; then
     1.8 +		if [ ! -f ${INITRAMFS}${INSTALLED}/${pkgname}/files.list ]; then
     1.9  			tazpkg get-install $pkgname --root=$INITRAMFS 2>&1 | tee -a $LOG/initramfs.log
    1.10  			sleep 1
    1.11  		else
    1.12 @@ -215,13 +215,13 @@
    1.13  
    1.14  slitaz_union () {
    1.15  
    1.16 -	if [ -d ${MODULES_DIR}/${mod}/var/lib/tazpkg/installed ]; then
    1.17 +	if [ -d ${MODULES_DIR}/${mod}${INSTALLED} ]; then
    1.18  		echo "${mod} module exist. Moving on."
    1.19 -	elif [ ! -d ${MODULES_DIR}/${mod}/var/lib/tazpkg/installed ]; then
    1.20 +	elif [ ! -d ${MODULES_DIR}/${mod}${INSTALLED} ]; then
    1.21  		if [ -f "$PROFILE/list/${mod}.list" ]; then
    1.22  			[ -f ${LOG}/${mod}-current.log ] && rm -f ${LOG}/${mod}-current.log
    1.23  			cat "$PROFILE/list/${mod}.list" | grep -v "^#" | while read pkgname; do
    1.24 -				if [ ! -f ${UNION}/var/lib/tazpkg/installed/${pkgname}/files.list ]; then
    1.25 +				if [ ! -f ${UNION}${INSTALLED}/${pkgname}/files.list ]; then
    1.26  					tazpkg get-install $pkgname --root=${UNION} 2>&1 | tee -a ${LOG}/${mod}-current.log
    1.27  					sleep 1
    1.28  				else
    1.29 @@ -233,7 +233,7 @@
    1.30  		if [ -f $PROFILE/list/${mod}.removelist ]; then
    1.31  			[ -f ${LOG}/${mod}-current-removelist.log ] && rm -f ${LOG}/${mod}-current-removelist.log
    1.32  			cat "$PROFILE/list/${mod}.removelist" | grep -v "^#" | while read pkgname; do
    1.33 -				if [ -f ${UNION}/var/lib/tazpkg/installed/${pkgname}/files.list ]; then
    1.34 +				if [ -f ${UNION}${INSTALLED}/${pkgname}/files.list ]; then
    1.35  					echo "y" | tazpkg remove ${pkgname} --root=${UNION} 2>&1 | tee -a ${LOG}/${mod}-current-removelist.log
    1.36  					sleep 1
    1.37  				else
    1.38 @@ -334,15 +334,12 @@
    1.39  		[ "$BACKUP_ALL" = "yes" ] && cookorder=$PKGS/fullco.txt
    1.40  		[ "$BACKUP_ALL" = "yes" ] && cp -a $cookorder $PKGISO_DIR/fullco.txt
    1.41  		CACHE_REPOSITORY="$CACHE_DIR/$(cat /etc/slitaz-release)/packages"
    1.42 -
    1.43 +		[ -f $PROFILE/list/backupall.banned ] && cp -a $PROFILE/list/backupall.banned $ISODIR/blocked
    1.44 +		
    1.45  		cat $cookorder | grep -v "^#" | while read pkg; do
    1.46  			[ -f "$WOK/$pkg/receipt" ] || continue
    1.47  			unset rwanted pkg_VERSION incoming_pkg_VERSION cache_pkg_VERSION
    1.48  			rwanted=$(grep $'\t'$pkg$ $PKGS/wanted.txt | cut -f 1)
    1.49 -			if [ -f $PROFILE/list/backupall.banned ]; then
    1.50 -				[ "$BACKUP_ALL" = "yes" ] && \
    1.51 -					[ $(grep -l "^$pkg$" $PROFILE/list/backupall.banned) ] && continue
    1.52 -			fi
    1.53  			pkg_VERSION="$(grep -m1 -A1 ^$pkg$ $PACKAGES_REPOSITORY/packages.txt | \
    1.54  				tail -1 | sed 's/ *//')"
    1.55  			incoming_pkg_VERSION="$(grep -m1 -A1 ^$pkg$ $INCOMING_REPOSITORY/packages.txt | \
    1.56 @@ -351,8 +348,9 @@
    1.57  					tail -1 | sed 's/ *//')"
    1.58  			for wanted in $rwanted; do
    1.59  				if [ -f $PROFILE/list/backupall.banned ]; then
    1.60 -					[ "$BACKUP_ALL" = "yes" ] && \
    1.61 +					if [ "$BACKUP_ALL" = "yes" ]; then
    1.62  						[ $(grep -l "^$wanted$" $PROFILE/list/backupall.banned) ] && continue
    1.63 +					fi
    1.64  				fi
    1.65  				if [ -f $INCOMING_REPOSITORY/$wanted-$incoming_pkg_VERSION.tazpkg ]; then
    1.66  					info "Backing up $INCOMING_REPOSITORY/$wanted-$incoming_pkg_VERSION.tazpkg" | tee -a $LOG/backup_pkg.log
    1.67 @@ -366,6 +364,12 @@
    1.68  				fi
    1.69  			done
    1.70  			
    1.71 +			if [ -f $PROFILE/list/backupall.banned ]; then
    1.72 +				if [ "$BACKUP_ALL" = "yes" ]; then
    1.73 +					[ $(grep -l "^$pkg$" $PROFILE/list/backupall.banned) ] && continue
    1.74 +				fi
    1.75 +			fi
    1.76 +				
    1.77  			if [ -f $INCOMING_REPOSITORY/$pkg-$incoming_pkg_VERSION.tazpkg ]; then
    1.78  				info "Backing up $INCOMING_REPOSITORY/$pkg-$incoming_pkg_VERSION.tazpkg" | tee -a $LOG/backup_pkg.log
    1.79  				ln -sf $INCOMING_REPOSITORY/$pkg-$incoming_pkg_VERSION.tazpkg $PKGISO_DIR/$pkg-$incoming_pkg_VERSION.tazpkg
    1.80 @@ -436,8 +440,9 @@
    1.81  		[ -f $LOG/backup_src.log ] && rm -rf $LOG/backup_src.log
    1.82  		cat $cookorder | grep -v "^#"| while read pkg; do
    1.83  			if [ -f $PROFILE/list/backupall.banned ]; then
    1.84 -				[ "$BACKUP_ALL" = "yes" ] && \
    1.85 +				if [ "$BACKUP_ALL" = "yes" ]; then
    1.86  					[ $(grep -l "^$pkg$" $PROFILE/list/backupall.banned) ] && continue
    1.87 +				fi
    1.88  			fi
    1.89  			unset PATCH SOURCE TARBALL WANTED PACKAGE VERSION COOK_OPT WGET_URL KBASEVER
    1.90  			unset pkg_VERSION
    1.91 @@ -532,14 +537,14 @@
    1.92  imgcommon () {
    1.93  	for MOD in ${BASE_MODULES}; do
    1.94  		if [ -d "${MODULES_DIR}/${MOD}" ]; then
    1.95 -			_mksquash "${MODULES_DIR}/${MOD}" "$ISODIR/$CDNAME/base" /var/lib/tazpkg/installed
    1.96 +			_mksquash "${MODULES_DIR}/${MOD}" "$ISODIR/$CDNAME/base" $INSTALLED
    1.97  		fi
    1.98  	done
    1.99  	
   1.100  	if [ "${MODULES}" != "" ]; then
   1.101  		for MOD in ${MODULES}; do
   1.102  			if [ -d "${MODULES_DIR}/${MOD}" ]; then
   1.103 -				_mksquash "${MODULES_DIR}/${MOD}" "$ISODIR/$CDNAME/modules" /var/lib/tazpkg/installed
   1.104 +				_mksquash "${MODULES_DIR}/${MOD}" "$ISODIR/$CDNAME/modules" $INSTALLED
   1.105  			fi
   1.106  		done
   1.107  	fi