SliTaz Repositories

     1.1 --- a/cookiso	Fri Aug 24 22:00:29 2012 +0000
     1.2 +++ b/cookiso	Fri Aug 24 22:04:28 2012 +0000
     1.3 @@ -14,7 +14,9 @@
     1.4  SSH_HOST="slitaz@mirror.slitaz.org"
     1.5  #BWLIMIT="--bwlimit=40"
     1.6  
     1.7 -. /usr/lib/slitaz/libcook.sh
     1.8 +. /usr/lib/slitaz/libcookiso.sh
     1.9 +
    1.10 +check_root
    1.11  
    1.12  # Parse cmdline options.
    1.13  for opt in "$@"
    1.14 @@ -34,7 +36,7 @@
    1.15  # Default to rolling, or: cookiso [cmd] --version=stable
    1.16  case "$version" in
    1.17  	stable)
    1.18 -		string=$(cat /etc/slitaz-release) ;;
    1.19 +		string=stable ;;
    1.20  	cooking)
    1.21  		string=cooking ;;
    1.22  	*)
    1.23 @@ -114,13 +116,13 @@
    1.24  		tazlito get-flavor $flavor | tee -a $log
    1.25  		# BUG: script sometimes screws up conspy on Tank
    1.26  		#script -c "yes '' | tazlito gen-distro" -a $log
    1.27 -		yes '' | tazlito gen-distro 2>&1 | tee -a $log
    1.28 +		tazlito gen-distro 2>&1 | tee -a $log
    1.29  		# Rename ISO and md5
    1.30  		echo "Moving ISO to: $iso/$name.iso" | tee -a $log
    1.31  		mv -f $SLITAZ/distro/slitaz-$flavor.iso $iso/$name.iso
    1.32  		cd $iso && md5sum $name.iso > $name.md5
    1.33  		echo "Cookiso ended: $(date '+%Y-%m-%d %H:%M')" | tee -a $log
    1.34 -	done && echo ""
    1.35 +	done && newline
    1.36  	# Push ISO to mirror if requested.
    1.37  	[ "$push" ] && push_iso
    1.38  }
    1.39 @@ -156,20 +158,20 @@
    1.40  			esac
    1.41  		fi
    1.42  		# Needed packages
    1.43 -		for pkg in mercurial tazlito rsync dropbear
    1.44 +		for pkg in mercurial tazlito rsync dropbear squashfs
    1.45  		do
    1.46  			[ -d "$INSTALLED/$pkg" ] || tazpkg -gi $pkg
    1.47  		done
    1.48  		echo "Creating directories and files..."
    1.49  		mkdir -p $cache $iso
    1.50  		touch $activity
    1.51 -		sed -i s'/^WORK_DIR=.*/WORK_DIR="\/home\/slitaz"/' \
    1.52 +		sed -i "s|WORK_DIR=.*|WORK_DIR="$SLITAZ"|g" \
    1.53  			/etc/tazlito/tazlito.conf
    1.54 -		echo ""
    1.55 +		newline
    1.56  		echo "Flavors files : $SLITAZ/flavors"
    1.57  		echo "Cache files   : $cache"
    1.58  		echo "ISO images    : $iso"
    1.59 -		echo "" ;;
    1.60 +		newline ;;
    1.61  	push)
    1.62  		# Manually upload an ISO to a server.
    1.63  		flavors_list
    1.64 @@ -218,7 +220,7 @@
    1.65  			done
    1.66  		else
    1.67  			echo "No changes found in packages MD5 sum" | log_bot
    1.68 -			echo "" > $commits.tmp
    1.69 +			newline > $commits.tmp
    1.70  		fi
    1.71  		cp -f $pkgs $cache
    1.72