SliTaz Repositories

     1.1 --- a/mkiso.sh	Sat Dec 25 00:44:15 2010 +0000
     1.2 +++ b/mkiso.sh	Sun Dec 26 23:31:03 2010 +0000
     1.3 @@ -31,12 +31,12 @@
     1.4  UNION="$WORKING/union"
     1.5  LOG="$WORKING/log"
     1.6  ISODIR="$WORKING/iso"
     1.7 -IMGNAME="$PROFILE/$CDNAME-$(date +%F).iso"
     1.8 +IMGNAME="$PROFILE/$CDNAME-$1-$(date +%F).iso"
     1.9  IMGMD5NAME="$IMGNAME.md5"
    1.10  LASTBR="$INITRAMFS"
    1.11  SGNFILE="$ISODIR/$CDNAME/livecd.sgn"
    1.12  MODULES_DIR="$WORKING/modules"
    1.13 -HG_DIR="$WORKING/hg"
    1.14 +HG_DIR="/home/slitaz/hg"
    1.15  COPY_HG="no"
    1.16  UPDATE_HG="no"
    1.17  BACKUP_SOURCES="no"
    1.18 @@ -144,12 +144,12 @@
    1.19  }
    1.20  
    1.21  copy_hg() {
    1.22 -	if [ ! -d ${HG_DIR}/hg-${1}/home/slitaz/hg/$1 ]; then
    1.23 +	if [ ! -d ${HG_DIR}/${1}/home/slitaz/hg/$1 ]; then
    1.24  		info "Cloning $1 repo ..."
    1.25 -		hg clone http://hg.slitaz.org/$1 ${HG_DIR}/hg-${1}/home/slitaz/hg/$1
    1.26 -	elif [ -d ${HG_DIR}/hg-${1}/home/slitaz/hg/$1 -a ${UPDATE_HG} = "yes" ]; then
    1.27 +		hg clone http://hg.slitaz.org/$1 ${HG_DIR}/${1}/home/slitaz/hg/$1
    1.28 +	elif [ -d ${HG_DIR}/${1}/home/slitaz/hg/$1 -a ${UPDATE_HG} = "yes" ]; then
    1.29  		info "Updating $1 repo ..."
    1.30 -		cd ${HG_DIR}/hg-${1}/home/slitaz/hg/$1 &&
    1.31 +		cd ${HG_DIR}/${1}/home/slitaz/hg/$1 &&
    1.32  		hg pull -u
    1.33  		cd $PROFILE
    1.34  	fi
    1.35 @@ -159,8 +159,8 @@
    1.36  	if [ ! -d "$ISODIR/$CDNAME/modules/hg" ]; then
    1.37  		mkdir -p "$ISODIR/$CDNAME/modules/hg"
    1.38  	fi
    1.39 -	if [ -d ${HG_DIR}/hg-${1}/home/slitaz/hg/$1 ]; then
    1.40 -		_mksquash ${HG_DIR}/hg-${1} "$ISODIR/$CDNAME/modules/hg" /home/slitaz/hg/$1
    1.41 +	if [ -d ${HG_DIR}/${1}/home/slitaz/hg/$1 ]; then
    1.42 +		_mksquash ${HG_DIR}/${1} "$ISODIR/$CDNAME/modules/hg" /home/slitaz/hg/$1
    1.43  	fi
    1.44  }
    1.45  
    1.46 @@ -313,7 +313,7 @@
    1.47  
    1.48  	if [ "${HG_LIST}" != "" ]; then
    1.49  		for hg in ${HG_LIST}; do
    1.50 -			if [ -d "${MODULES_DIR}/hg-${hg}" ]; then
    1.51 +			if [ -d "${MODULES_DIR}/${hg}" ]; then
    1.52  				squashfs_hg $hg
    1.53  			fi
    1.54  		done