tazlito rev 532
tazlito: typo for $FLAVOR.nonfree
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Tue Nov 09 14:40:46 2021 +0000 (2021-11-09) |
| parents | 2b9019bb1593 |
| children | 00aa3fa52e4f |
| files | oldstuff/tazlitobox tazlito tazlito-wiz tazlito.png |
line diff
1.1 --- a/oldstuff/tazlitobox Fri Jun 18 13:45:55 2021 +0000 1.2 +++ b/oldstuff/tazlitobox Tue Nov 09 14:40:46 2021 +0000 1.3 @@ -31,7 +31,7 @@ 1.4 # We need to parse flavors.list for GTK tree. 1.5 list_flavors() 1.6 { 1.7 - tazlito list-flavors | grep ^[a-z] | while read line 1.8 + tazlito list-flavors | grep '^[a-z]' | while read line 1.9 do 1.10 info=`echo -n $line | awk '{print $1 " " $2 " " $3}'` 1.11 printinfo=`echo -n $line | awk '{print $1 "|" $2 "|" $3}'`
2.1 --- a/tazlito Fri Jun 18 13:45:55 2021 +0000 2.2 +++ b/tazlito Tue Nov 09 14:40:46 2021 +0000 2.3 @@ -481,7 +481,7 @@ 2.4 fi 2.5 local fclust=$({ 2.6 [ -d $basedir/efi ] && 2.7 - find $basedir/efi -type f -exec stat -c "%s %n" {} \; 2.8 + find $basedir/efi -type f -exec busybox stat -c "%s %n" {} \; 2.9 while [ -s "$1" ]; do 2.10 local efifile 2.11 case "$1" in 2.12 @@ -861,7 +861,7 @@ 2.13 # Deduplicate files (MUST be on the same filesystem). 2.14 2.15 deduplicate() { 2.16 - find "${@:-.}" -xdev -type f ! -type l -size +0c -exec stat -c '%s-%a-%u-%g %i %h %n' {} \; | sort | \ 2.17 + find "${@:-.}" -xdev -type f ! -type l -size +0c -exec busybox stat -c '%s-%a-%u-%g %i %h %n' {} \; | sort | \ 2.18 ( 2.19 save=0; hardlinks=0; old_attr=""; old_inode=""; old_link=""; old_file=""; hinode="" 2.20 while read attr inode link file; do 2.21 @@ -885,7 +885,7 @@ 2.22 _ '%s Kbytes saved in %s duplicate files.' "$save" "$hardlinks" 2.23 ) 2.24 2.25 - find "$@" -xdev -type l -exec stat -c '%s-%u-%g %i %h %n' {} \; | \ 2.26 + find "$@" -xdev -type l -exec busybox stat -c '%s-%u-%g %i %h %n' {} \; | \ 2.27 while read attr inode link file; do 2.28 echo "$attr-$(readlink "$file" | uuencode -m - | \ 2.29 sed '1d;:b;{N;s/\n//;bb;}') $inode $link $file" 2.30 @@ -1114,7 +1114,7 @@ 2.31 action 'Merge %s (%s) into %s (%s)' "$(basename "$1")" "$size1" "$(basename "$2")" "$size2" 2.32 2.33 # merge symlinks files and devices 2.34 - ( cd "$1"; find ) | \ 2.35 + ( cd "$1"; find . ) | \ 2.36 while read file; do 2.37 files_match "$1/$file" "$2/$file" "$file" && 2.38 remove_with_path "$2/$file" 2.39 @@ -1585,7 +1585,7 @@ 2.40 unxz $i || gunzip $i || lzma d $i ${i%.gz} 2.41 rm -f $i 2.42 done 2>/dev/null 2.43 - (cd $TMP_DIR/initfs; find | busybox cpio -o -H newc 2>/dev/null) | \ 2.44 + (cd $TMP_DIR/initfs; find . | busybox cpio -o -H newc 2>/dev/null) | \ 2.45 lzma e $TMP_DIR/initfs.gz -si 2.46 lzma_set_size $TMP_DIR/initfs.gz 2.47 rm -rf $TMP_DIR/initfs 2.48 @@ -1863,7 +1863,7 @@ 2.49 2.50 # Repacked packages: high priority 2.51 repacked="$PACKAGES_REPOSITORY" 2.52 - if [ -d "$repacked" -a "$repacked" != "$fresh" ] && ls "$repacked" | grep -q ".tazpkg"; then 2.53 + if [ -d "$repacked" ] && [ "$repacked" != "$fresh" ] && ls "$repacked" | grep -q ".tazpkg"; then 2.54 # According to Tazlito setup file (tazlito.conf): 2.55 # WORK_DIR="/home/slitaz/$SLITAZ_VERSION" 2.56 # or 2.57 @@ -2389,13 +2389,13 @@ 2.58 EXTRAVERSION="" 2.59 eval $(grep ^EXTRAVERSION= $ROOTFS$INSTALLED/$i/receipt) 2.60 eval $(grep ^CATEGORY= $ROOTFS$INSTALLED/$i/receipt) 2.61 - if [ "$CATEGORY" = 'non-free' -a "${i%%-*}" != 'get' ]; then 2.62 + if [ "$CATEGORY" = 'non-free' ] && [ "${i%%-*}" != 'get' ]; then 2.63 echo "$i" >> $FLAVOR.nonfree 2.64 else 2.65 echo "$i-$VERSION$EXTRAVERSION" >> $FLAVOR.pkglist 2.66 fi 2.67 done 2.68 - [ -s $FLAVOR.nonfree ] && $FILES="$FILES\n$FLAVOR.nonfree" 2.69 + [ -s $FLAVOR.nonfree ] && FILES="$FILES\n$FLAVOR.nonfree" 2.70 for i in $LOCALSTATE/undigest/*/mirror ; do 2.71 [ -s $i ] && cat $i >> $FLAVOR.mirrors 2.72 done 2.73 @@ -2621,12 +2621,12 @@ 2.74 mkdir -p $TMP_DIR/iso $TMP_DIR/rootfs $TMP_DIR/flavor 2.75 mount -o loop,ro $2 $TMP_DIR/iso 2.76 flavordata $2 | (cd $TMP_DIR/flavor; cpio -i 2>/dev/null) 2.77 - if [ -s $TMP_DIR/iso/boot/rootfs1.gz -a \ 2.78 - ! -s $TMP_DIR/flavor/*.desc ]; then 2.79 + if [ -s $TMP_DIR/iso/boot/rootfs1.gz ] && 2.80 + [ ! -s $TMP_DIR/flavor/*.desc ]; then 2.81 _ 'META flavors are not supported.' 2.82 umount -d $TMP_DIR/iso 2.83 - elif [ ! -s $TMP_DIR/iso/boot/rootfs.gz -a \ 2.84 - ! -s $TMP_DIR/iso/boot/rootfs1.gz ]; then 2.85 + elif [ ! -s $TMP_DIR/iso/boot/rootfs.gz ] && 2.86 + [ ! -s $TMP_DIR/iso/boot/rootfs1.gz ]; then 2.87 _ 'No %s in ISO image. Needs a SliTaz ISO.' '/boot/rootfs.gz' 2.88 umount -d $TMP_DIR/iso 2.89 else 2.90 @@ -2651,7 +2651,7 @@ 2.91 [ -d $TMP_DIR/rootcd/efi ] && mv $TMP_DIR/rootcd/efi $TMP_DIR/rootfs 2.92 sed 's/.* \(.*\).tazpkg*/\1/' > $TMP_DIR/$FLAVOR.pkglist \ 2.93 < $TMP_DIR/rootfs$INSTALLED.md5 2.94 - PKGCNT=$(grep -v ^# $TMP_DIR/$FLAVOR.pkglist | wc -l | awk '{ print $1 }') 2.95 + PKGCNT=$(grep -cv ^# $TMP_DIR/$FLAVOR.pkglist) 2.96 if [ -s $TMP_DIR/flavor/*desc ]; then 2.97 cp $TMP_DIR/flavor/*.desc $TMP_DIR/$FLAVOR.desc 2.98 [ -s $TMP_DIR/$FLAVOR.receipt ] && 2.99 @@ -2722,13 +2722,13 @@ 2.100 LIST_NAME='distro-packages.list' 2.101 fi 2.102 2.103 - [ -d "$ROOTFS" -a -z "$forced" ] && die "A rootfs exists in '$DISTRO'." \ 2.104 + [ -d "$ROOTFS" ] && [ -z "$forced" ] && die "A rootfs exists in '$DISTRO'." \ 2.105 'Please clean the distro tree or change directory path.' 2.106 [ -d "$ROOTFS" ] && rm -rf "$ROOTFS" 2.107 [ -d "$ROOTCD" ] && rm -rf "$ROOTCD" 2.108 2.109 # If list not given: build list with all installed packages 2.110 - if [ ! -f "$LIST_NAME" -a -f "$LOCALSTATE/installed.info" ]; then 2.111 + if [ ! -f "$LIST_NAME" ] && [ -f "$LOCALSTATE/installed.info" ]; then 2.112 awk -F$'\t' '{print $1}' "$LOCALSTATE/installed.info" >> "$LIST_NAME" 2.113 fi 2.114 2.115 @@ -2918,7 +2918,7 @@ 2.116 install_list_to_rootfs "$DISTRO/list-packages0$n" "${ROOTFS}0$n" 2.117 2.118 action 'Updating the boot directory...' 2.119 - yes n | cp -ai ${ROOTFS}0$n/boot $ROOTCD 2> /dev/null 2.120 + cp -an ${ROOTFS}0$n/boot $ROOTCD 2> /dev/null 2.121 rm -rf ${ROOTFS}0$n/boot 2.122 2.123 cd $DISTRO 2.124 @@ -3248,10 +3248,10 @@ 2.125 _ '%s is already a merged iso. Aborting.' "$1" 2.126 cleanup_merge 2.127 fi 2.128 - if [ ! -f $TMP_DIR/iso/boot/isolinux/ifmem.c32 -a 2.129 - ! -f $TMP_DIR/iso/boot/isolinux/c32box.c32 ]; then 2.130 - if [ ! -f /boot/isolinux/ifmem.c32 -a 2.131 - ! -f /boot/isolinux/c32box.c32 ]; then 2.132 + if [ ! -f $TMP_DIR/iso/boot/isolinux/ifmem.c32 ] && 2.133 + [ ! -f $TMP_DIR/iso/boot/isolinux/c32box.c32 ]; then 2.134 + if [ ! -f /boot/isolinux/ifmem.c32 ] && 2.135 + [ ! -f /boot/isolinux/c32box.c32 ]; then 2.136 cat <<EOT 2.137 No file /boot/isolinux/ifmem.c32 2.138 Please install syslinux package !
3.1 --- a/tazlito-wiz Fri Jun 18 13:45:55 2021 +0000 3.2 +++ b/tazlito-wiz Tue Nov 09 14:40:46 2021 +0000 3.3 @@ -80,7 +80,6 @@ 3.4 2) tazpanel live; exit 0;; 3.5 3) terminal -T 'write-iso' -e 'tazlito writeiso lzma'; exit 0;; 3.6 4) tazweb 'file:///usr/share/doc/tazlito/tazlito.html'; exit 0;; 3.7 - *) continue;; 3.8 esac 3.9 3.10 # Deal with $main values
4.1 Binary file tazlito.png has changed