cookutils rev 548 slitaz-tank

cookiso.conf: Source /etc/slitaz/slitaz.conf file now that SLITAZ_RELEASE is used instead of SLITAZ_VERSION.
author Christopher Rogers <slaxemulator@gmail.com>
date Tue Oct 16 00:14:04 2012 +0000 (2012-10-16)
parents 107db3bf62b2
children ad9af7bfcc78
files cookiso.conf lib/libcookiso.sh
line diff
     1.1 --- a/cookiso.conf	Tue Oct 16 00:01:10 2012 +0000
     1.2 +++ b/cookiso.conf	Tue Oct 16 00:14:04 2012 +0000
     1.3 @@ -2,11 +2,11 @@
     1.4  # configuration file.
     1.5  #
     1.6  
     1.7 -# SliTaz version to use for ISO name and files path.
     1.8 -SLITAZ_VERSION=`cat /etc/slitaz-release`
     1.9 +# this is to make SLITAZ_RELEASE variable works
    1.10 +. /etc/slitaz/slitaz.conf
    1.11  
    1.12  # Name of the ISO image to generate.
    1.13 -ISO_NAME="slitaz-$SLITAZ_VERSION"
    1.14 +ISO_NAME="slitaz-$SLITAZ_RELEASE"
    1.15  #ISO_NAME="slitaz-cooking-`date +%Y%m%d`"
    1.16  
    1.17  # ISO image volume name.
    1.18 @@ -16,7 +16,7 @@
    1.19  PREPARED="$USER"
    1.20  
    1.21  # Tazlito work directory with flavors, distro and packages files.
    1.22 -WORK_DIR="/home/slitaz/$SLITAZ_VERSION"
    1.23 +WORK_DIR="$SLITAZ"
    1.24  
    1.25  # Path to the packages repository and the packages.list.
    1.26  PACKAGES_REPOSITORY="$WORK_DIR/packages"
     2.1 --- a/lib/libcookiso.sh	Tue Oct 16 00:01:10 2012 +0000
     2.2 +++ b/lib/libcookiso.sh	Tue Oct 16 00:14:04 2012 +0000
     2.3 @@ -12,7 +12,7 @@
     2.4  MIRROR=$DB/mirror
     2.5  [ -f "/etc/slitaz/cookiso.conf" ] && CONFIG_FILE="/etc/slitaz/cookiso.conf"
     2.6  [ -f "$TOP_DIR/cookiso.conf" ] && CONFIG_FILE="$TOP_DIR/cookiso.conf"
     2.7 -DEFAULT_MIRROR="$MIRROR_URL/packages/$SLITAZ_VERSION/"
     2.8 +DEFAULT_MIRROR="$MIRROR_URL/packages/$SLITAZ_RELEASE/"
     2.9  
    2.10  log=/var/log/cookiso.log
    2.11  if check_root; then