slitaz-modular rev 55

Fixed taz2xz. Path for INSTALLED don't need version in them.
author Christopher Rogers <slaxemulator@gmail.com>
date Sun Apr 10 17:18:56 2011 +0000 (2011-04-10)
parents c1a6007116b3
children cc310edb8c9c
files initramfs/usr/bin/taz2xz
line diff
     1.1 --- a/initramfs/usr/bin/taz2xz	Sun Apr 10 12:44:31 2011 +0000
     1.2 +++ b/initramfs/usr/bin/taz2xz	Sun Apr 10 17:18:56 2011 +0000
     1.3 @@ -4,8 +4,7 @@
     1.4  . liblinuxlive || exit 1
     1.5  
     1.6  . /etc/slitaz/slitaz.conf
     1.7 -ISODIR="$SLITAZ_DIR/slitaz-modular/$PROFILE/iso"
     1.8 -PKGLIST="$SLITAZ_DIR/slitaz-modular/$PROFILE/packages.list"
     1.9 +
    1.10  INSTALL_FILES="receipt files.list md5sum volatile.cpio.gz"
    1.11  
    1.12  if [ "$1" = "" ]; then
    1.13 @@ -29,16 +28,16 @@
    1.14  PACKAGE_FILE="$(find -name "$1-*.tazpkg")"
    1.15  { cpio --quiet -i receipt > /dev/null 2>&1; } < $PACKAGE_FILE
    1.16  source receipt || exit 1
    1.17 -PACKAGE="${PACKAGE}-${VERSION}${EXTRAVERSION}"
    1.18 -tazpkg extract $PACKAGE.tazpkg
    1.19 +PKGNAME="${PACKAGE}-${VERSION}${EXTRAVERSION}"
    1.20 +tazpkg extract $PKGNAME.tazpkg
    1.21  for i in $INSTALL_FILES; do
    1.22 -	if [ -f "$PACKAGE/$i" ]; then
    1.23 -		mkdir -p $PACKAGE/fs/$INSTALLED/$PACKAGE
    1.24 -		cp -a $PACKAGE/$i $PACKAGE/fs/$INSTALLED/$PACKAGE/$i
    1.25 +	if [ -f "$PKGNAME/$i" ]; then
    1.26 +		mkdir -p $PKGNAME/fs/$INSTALLED/$PACKAGE
    1.27 +		cp -a $PKGNAME/$i $PKGNAME/fs/$INSTALLED/$PACKAGE/$i
    1.28  	fi
    1.29  done
    1.30 -md5sum $PACKAGE.tazpkg > $PACKAGE/fs/$INSTALLED/$PACKAGE/pkgmd5
    1.31 -create_module $PACKAGE/fs $CUR_DIR/$PACKAGE.xz -comp xz -Xbcj x86
    1.32 +md5sum $PKGNAME.tazpkg > $PKGNAME/fs/$INSTALLED/$PACKAGE/pkgmd5
    1.33 +create_module $PKGNAME/fs $CUR_DIR/$PKGNAME.xz -comp xz -Xbcj x86
    1.34  
    1.35  cd $CUR_DIR
    1.36  rm -rf $tmp_dir