tazlito rev 120
Tiny edits (damn)
| author | Paul Issott <paul@slitaz.org> |
|---|---|
| date | Sun Jan 17 19:52:15 2010 +0000 (2010-01-17) |
| parents | 0f3e12c41935 |
| children | bb333e7cd912 |
| files | tazlito |
line diff
1.1 --- a/tazlito Sun Jan 17 18:57:49 2010 +0100 1.2 +++ b/tazlito Sun Jan 17 19:52:15 2010 +0000 1.3 @@ -43,7 +43,7 @@ 1.4 if [ "$COMMAND" = "gen-config" ] ; then 1.5 continue 1.6 else 1.7 - echo "Unable to find any configuration file. Please read the doc" 1.8 + echo "Unable to find any configuration file. Please read the docs" 1.9 echo "or run '`basename $0` gen-config' to get an empty config file." 1.10 exit 0 1.11 fi 1.12 @@ -241,7 +241,7 @@ 1.13 -V "$VOLUM_NAME" -p "$PREPARED" -input-charset iso8859-1 \ 1.14 -boot-info-table $2 1.15 if [ -x /usr/bin/isohybrid ]; then 1.16 - echo -n "Create hybrid ISO..." 1.17 + echo -n "Creating hybrid ISO..." 1.18 /usr/bin/isohybrid $1 2> /dev/null 1.19 status 1.20 fi 1.21 @@ -506,7 +506,7 @@ 1.22 # Update isolinux config files for multiple rootfs 1.23 update_bootconfig() 1.24 { 1.25 - echo -n "Update boot config files" 1.26 + echo -n "Updating boot config files..." 1.27 grep -l 'include common' $1/*.cfg | \ 1.28 while read file ; do 1.29 awk -v n=$(echo $2 | awk '{ print NF/2 }') '{ 1.30 @@ -893,7 +893,7 @@ 1.31 if [ -f $FLAVOR.flavor ] || download $FLAVOR.flavor; then 1.32 mkdir $TMP_DIR 1.33 zcat $FLAVOR.flavor | ( cd $TMP_DIR; cpio -i >/dev/null ) 1.34 - echo -n "Update $FLAVOR package list..." 1.35 + echo -n "Updating $FLAVOR package list..." 1.36 [ -s /var/lib/tazpkg/packages.list ] || tazpkg recharge 1.37 packed_size=0; unpacked_size=0 1.38 while read org; do 1.39 @@ -945,7 +945,7 @@ 1.40 if [ -f $FLAVOR.flavor ] || download $FLAVOR.flavor; then 1.41 mkdir $TMP_DIR 1.42 zcat $FLAVOR.flavor | ( cd $TMP_DIR; cpio -i >/dev/null ) 1.43 - echo -n "Extract $FLAVOR..." 1.44 + echo -n "Extracting $FLAVOR..." 1.45 rm -rf $FLAVORS_REPOSITORY/$FLAVOR 2> /dev/null 1.46 mkdir -p $FLAVORS_REPOSITORY/$FLAVOR 1.47 echo "FLAVOR=\"$FLAVOR\"" > $FLAVORS_REPOSITORY/$FLAVOR/receipt 1.48 @@ -996,7 +996,7 @@ 1.49 FLAVOR=${2%.flavor} 1.50 if [ -s $FLAVORS_REPOSITORY/$FLAVOR/receipt ]; then 1.51 mkdir $TMP_DIR 1.52 - echo -n "Create flavor $FLAVOR..." 1.53 + echo -n "Creating flavor $FLAVOR..." 1.54 [ -s /var/lib/tazpkg/packages.list ] || tazpkg recharge 1.55 if [ -s $FLAVORS_REPOSITORY/$FLAVOR/mirrors ]; then 1.56 cp $FLAVORS_REPOSITORY/$FLAVOR/mirrors \ 1.57 @@ -1087,13 +1087,13 @@ 1.58 status 1.59 mkdir $TMP_DIR 1.60 zcat $FLAVOR.flavor | ( cd $TMP_DIR; cpio -i 2>/dev/null ) 1.61 - echo -n "Create distro-packages.list..." 1.62 + echo -n "Creating distro-packages.list..." 1.63 mv $TMP_DIR/$FLAVOR.nonfree non-free.list 2> /dev/null 1.64 mv $TMP_DIR/$FLAVOR.pkglist distro-packages.list 1.65 status 1.66 for i in rootcd rootfs; do 1.67 if [ -f $TMP_DIR/$FLAVOR.$i ]; then 1.68 - echo -n "Add $i..." 1.69 + echo -n "Adding $i..." 1.70 mkdir -p "$ADDFILES/$i" 1.71 zcat $TMP_DIR/$FLAVOR.$i | \ 1.72 ( cd "$ADDFILES/$i"; cpio -id 2> /dev/null) 1.73 @@ -1113,7 +1113,7 @@ 1.74 grep -q '^Rootfs list' $TMP_DIR/$FLAVOR.desc && 1.75 grep '^Rootfs list' $TMP_DIR/$FLAVOR.desc | \ 1.76 sed 's/.*: \(.*\)$/\1/' > /etc/tazlito/rootfs.list 1.77 - echo -n "Update tazlito.conf..." 1.78 + echo -n "Updating tazlito.conf..." 1.79 [ -f tazlito.conf ] || cp /etc/tazlito/tazlito.conf . 1.80 cat tazlito.conf | grep -v "^#VOLUM_NAME" | \ 1.81 sed "s/^VOLUM_NA/VOLUM_NAME=\"SliTaz $FLAVOR\"\\n#VOLUM_NA/" \ 1.82 @@ -1439,7 +1439,7 @@ 1.83 echo -n "Mirror URL : Missing /var/lib/tazpkg/mirror" 1.84 todomsg 1.85 else 1.86 - echo -n "Mirror configuration exist..." 1.87 + echo -n "Mirror configuration exists..." 1.88 status 1.89 fi 1.90 # Isolinux msg 1.91 @@ -1518,7 +1518,7 @@ 1.92 1.93 ISO=$1.merged 1.94 # Extract filesystems 1.95 - echo -n "Mount $1" 1.96 + echo -n "Mounting $1" 1.97 mount -o loop,ro $1 $TMP_DIR/mnt 2> /dev/null 1.98 status || cleanup_merge 1.99 cp -a $TMP_DIR/mnt $TMP_DIR/iso 1.100 @@ -1526,7 +1526,7 @@ 1.101 ln $TMP_DIR/iso/boot/vmlinuz* $TMP_DIR/iso/boot/bzImage 1.102 umount -d $TMP_DIR/mnt 1.103 if [ -f $TMP_DIR/iso/boot/rootfs1.gz ]; then 1.104 - echo "$1 is already a merged iso. Abort." 1.105 + echo "$1 is already a merged iso. Aborting." 1.106 cleanup_merge 1.107 fi 1.108 if [ ! -f $TMP_DIR/iso/boot/isolinux/ifmem.c32 ]; then 1.109 @@ -1541,7 +1541,7 @@ 1.110 cp /boot/isolinux/ifmem.c32 $TMP_DIR/iso/boot/isolinux 1.111 fi 1.112 1.113 - echo -n "Extract iso/rootfs.gz" 1.114 + echo -n "Extracting iso/rootfs.gz" 1.115 extract_rootfs $TMP_DIR/iso/boot/rootfs.gz $TMP_DIR/rootfs1 && 1.116 [ -d $TMP_DIR/rootfs1/etc ] 1.117 status || cleanup_merge 1.118 @@ -1553,21 +1553,21 @@ 1.119 append="$append $1 slitaz$n" 1.120 shift # skip size N 1.121 mkdir -p $TMP_DIR/rootfs$n 1.122 - echo -n "Extract $1" 1.123 + echo -n "Extracting $1" 1.124 extract_rootfs $1 $TMP_DIR/rootfs$n && 1.125 [ -d $TMP_DIR/rootfs$n/etc ] 1.126 status || cleanup_merge 1.127 mergefs $TMP_DIR/rootfs$n $TMP_DIR/rootfs$p 1.128 - echo "Create rootfs$p.gz" 1.129 + echo "Creating rootfs$p.gz" 1.130 pack_rootfs $TMP_DIR/rootfs$p $TMP_DIR/iso/boot/rootfs$p.gz 1.131 status 1.132 done 1.133 - echo "Create rootfs$n.gz" 1.134 + echo "Creating rootfs$n.gz" 1.135 pack_rootfs $TMP_DIR/rootfs$n $TMP_DIR/iso/boot/rootfs$n.gz 1.136 status 1.137 rm -f $TMP_DIR/iso/boot/rootfs.gz 1.138 update_bootconfig $TMP_DIR/iso/boot/isolinux "$append" 1.139 - echo "Generate $ISO" 1.140 + echo "Generating $ISO" 1.141 create_iso $ISO $TMP_DIR/iso 1.142 rm -rf $TMP_DIR 1.143 ;; 1.144 @@ -1580,14 +1580,14 @@ 1.145 1.146 mkdir -p $TMP_DIR/mnt 1.147 # Extract filesystems 1.148 - echo -n "Mount $ISO" 1.149 + echo -n "Mounting $ISO" 1.150 mount -o loop,ro $ISO $TMP_DIR/mnt 2> /dev/null 1.151 status || cleanup_merge 1.152 cp -a $TMP_DIR/mnt $TMP_DIR/iso 1.153 umount -d $TMP_DIR/mnt 1.154 1.155 for i in $TMP_DIR/iso/boot/rootfs* ; do 1.156 - echo -n "Repack $(basename $i)" 1.157 + echo -n "Repacking $(basename $i)" 1.158 (zcat $i || unlzma -c $i || cat $i) \ 1.159 2>/dev/null > $TMP_DIR/rootfs 1.160 lzma e $TMP_DIR/rootfs $i \ 1.161 @@ -1595,7 +1595,7 @@ 1.162 status 1.163 done 1.164 1.165 - echo "Generate $ISO" 1.166 + echo "Generating $ISO" 1.167 create_iso $ISO $TMP_DIR/iso 1.168 rm -rf $TMP_DIR 1.169 ;;