tazlito rev 83
Fix typos and clean up comments
| author | Mike D. Smith <MikeDSmith25@gmail.com> |
|---|---|
| date | Sat Jul 19 05:30:44 2008 +0000 (2008-07-19) |
| parents | 396fa5d93024 |
| children | 8b29b5b304b1 |
| files | Makefile tazlito tazlito.conf |
line diff
1.1 --- a/Makefile Wed Jul 16 15:47:25 2008 +0000 1.2 +++ b/Makefile Sat Jul 19 05:30:44 2008 +0000 1.3 @@ -1,5 +1,5 @@ 1.4 # Makefile for Tazlito. 1.5 -# Check the README for more informations. 1.6 +# Check the README for more information. 1.7 # 1.8 SBINDIR?=/sbin 1.9 PREFIX?=/usr
2.1 --- a/tazlito Wed Jul 16 15:47:25 2008 +0000 2.2 +++ b/tazlito Sat Jul 19 05:30:44 2008 +0000 2.3 @@ -1,10 +1,10 @@ 2.4 #!/bin/sh 2.5 # TazLito - SliTaz Live Tool. 2.6 # 2.7 -# Tazlito is a tool to help generating and configuring SliTaz LiveCD 2.8 -# ISO images. You can creat a custom distro in one command from a list of 2.9 -# packages, extract a existing ISO image to hack it, creat new initramfs 2.10 -# and/or new ISO. Most commands must be run by root, expect the stats 2.11 +# Tazlito is a tool to help generate and configure SliTaz LiveCD 2.12 +# ISO images. You can create a custom distro in one command from a list of 2.13 +# packages, extract an existing ISO image to hack it, create a new initramfs 2.14 +# and/or a new ISO. Most commands must be run by root, except the stats 2.15 # and the configuration file manipulation. 2.16 # 2.17 # (C) 2007-2008 SliTaz - GNU General Public License. 2.18 @@ -83,7 +83,7 @@ 2.19 gen-liveflavor Generate a live-CD description from current system. 2.20 show-flavor Show live-CD description. 2.21 get-flavor Get a flavor's list of packages. 2.22 - extract-distro Extract and ISO to a directory and rebuild LiveCD tree. 2.23 + extract-distro Extract an ISO to a directory and rebuild LiveCD tree. 2.24 gen-distro Generated a Live distro and ISO from a list of packages. 2.25 clean-distro Remove all files generated by gen-distro. 2.26 addhacker Add Linux User Hacker to the current distro. 2.27 @@ -132,7 +132,7 @@ 2.28 done 2.29 } 2.30 2.31 -# exec hooks provided by some packages 2.32 +# Execute hooks provided by some packages 2.33 genisohooks() 2.34 { 2.35 local here=`pwd` 2.36 @@ -152,7 +152,7 @@ 2.37 fi 2.38 } 2.39 2.40 -# echo the package name if the tazpkg is already installed 2.41 +# Echo the package name if the tazpkg is already installed 2.42 installed_package_name() 2.43 { 2.44 local tazpkg 2.45 @@ -160,9 +160,9 @@ 2.46 local VERSION 2.47 local EXTRAVERSION 2.48 tazpkg=$1 2.49 - # try du find package name and version to be able 2.50 + # Try to find package name and version to be able 2.51 # to repack it from installation 2.52 - # a dash (-) can exist in name *and* in version 2.53 + # A dash (-) can exist in name *and* in version 2.54 package=${tazpkg%-*} 2.55 i=$package 2.56 while true; do 2.57 @@ -210,7 +210,7 @@ 2.58 fi 2.59 } 2.60 2.61 -# Gen a new ISO image using isolinux. 2.62 +# Generate a new ISO image using isolinux. 2.63 gen_livecd_isolinux() 2.64 { 2.65 # Some packages may want to alter iso 2.66 @@ -247,7 +247,7 @@ 2.67 genisohooks final 2.68 } 2.69 2.70 -# Gen a new initramfs from the root file system. 2.71 +# Generate a new initramfs from the root file system. 2.72 gen_initramfs() 2.73 { 2.74 # Just in case CTRL+c 2.75 @@ -309,7 +309,7 @@ 2.76 distro_sizes 2.77 } 2.78 2.79 -# Creat an empty configuration file. 2.80 +# Create an empty configuration file. 2.81 empty_config_file() 2.82 { 2.83 cat >> tazlito.conf << "EOF" 2.84 @@ -320,10 +320,10 @@ 2.85 # Name of the ISO image to generate. 2.86 ISO_NAME="" 2.87 2.88 -# ISO image volum name. 2.89 +# ISO image volume name. 2.90 VOLUM_NAME="SliTaz" 2.91 2.92 -# Name of the preparator. 2.93 +# Name of the preparer. 2.94 PREPARED="$USER" 2.95 2.96 # Path to the packages repository and the packages.list. 2.97 @@ -333,7 +333,7 @@ 2.98 # list of packages. 2.99 DISTRO="" 2.100 2.101 -# Path to the directory contening additional files 2.102 +# Path to the directory containing additional files 2.103 # to copy into the rootfs and rootcd of the LiveCD. 2.104 ADDFILES="$DISTRO/addfiles" 2.105 2.106 @@ -369,7 +369,7 @@ 2.107 echo "" 2.108 ;; 2.109 gen-config) 2.110 - # Gen a new config file in the current dir or the specified 2.111 + # Generate a new config file in the current dir or the specified 2.112 # directory by $2. 2.113 # 2.114 if [ -n "$2" ] ; then 2.115 @@ -439,7 +439,7 @@ 2.116 distro_stats 2.117 ;; 2.118 extract-distro) 2.119 - # Extract a ISO image to a directory and rebuild the LiveCD tree. 2.120 + # Extract an ISO image to a directory and rebuild the LiveCD tree. 2.121 # 2.122 check_root 2.123 ISO_IMAGE=$2 2.124 @@ -585,7 +585,7 @@ 2.125 @ flavor description 2.126 2.127 \033[1mExample: \033[0m 2.128 -@ Developper tools for slitaz maintainers 2.129 +@ Developer tools for slitaz maintainers 2.130 + slitaz-toolchain 2.131 + mercurial 2.132 " 2.133 @@ -746,7 +746,7 @@ 2.134 [ -d $PACKAGES_REPOSITORY ] || mkdir -p $PACKAGES_REPOSITORY 2.135 # Get the list of packages using cat for a file list. 2.136 LIST=`cat $LIST_NAME` 2.137 - # Verify if all packages in list are presents in $PACKAGES_REPOSITORY. 2.138 + # Verify if all packages in list are present in $PACKAGES_REPOSITORY. 2.139 REPACK="" 2.140 DOWNLOAD="" 2.141 for pkg in $LIST 2.142 @@ -778,7 +778,7 @@ 2.143 [ "$REPACK" = "n" -a "$DOWNLOAD" = "n" ] && exit 1 2.144 done 2.145 2.146 - # mount cdrom to be able to repack boot-loader packages 2.147 + # Mount cdrom to be able to repack boot-loader packages 2.148 if [ ! -e /boot -a -n "$CDROM" ]; then 2.149 mkdir $TMP_MNT 2.150 if mount -r $CDROM $TMP_MNT 2> /dev/null; then 2.151 @@ -807,17 +807,17 @@ 2.152 PACKAGE=$(installed_package_name $pkg) 2.153 mkdir -p $TMP_DIR 2.154 if [ ! -f $PACKAGES_REPOSITORY/$pkg.tazpkg ]; then 2.155 - # look for package in cache 2.156 + # Look for package in cache 2.157 if [ -f $CACHE_DIR/$pkg.tazpkg ]; then 2.158 ln -s $CACHE_DIR/$pkg.tazpkg $PACKAGES_REPOSITORY 2.159 - # look for package in running distribution 2.160 + # Look for package in running distribution 2.161 elif [ -n "$PACKAGE" -a "$REPACK" = "y" ]; then 2.162 tazpkg repack $PACKAGE && \ 2.163 mv $pkg.tazpkg $PACKAGES_REPOSITORY 2.164 fi 2.165 fi 2.166 if [ ! -f $PACKAGES_REPOSITORY/$pkg.tazpkg ]; then 2.167 - # get package from mirror 2.168 + # Get package from mirror 2.169 [ "$DOWNLOAD" = "y" ] && \ 2.170 download $pkg.tazpkg && \ 2.171 mv $pkg.tazpkg $PACKAGES_REPOSITORY 2.172 @@ -955,7 +955,7 @@ 2.173 status 2.174 # Change permissions. 2.175 # 2.176 - echo -n "Chmodig all files in /home/hacker..." 2.177 + echo -n "Chmoding all files in /home/hacker..." 2.178 chown -R 500.500 $ROOTFS/home/hacker 2.179 status 2.180 echo "================================================================================" 2.181 @@ -1034,7 +1034,7 @@ 2.182 echo "" 2.183 ;; 2.184 usage|*) 2.185 - # Clear and print usage also for all unknow commands. 2.186 + # Clear and print usage also for all unknown commands. 2.187 # 2.188 clear 2.189 usage
3.1 --- a/tazlito.conf Wed Jul 16 15:47:25 2008 +0000 3.2 +++ b/tazlito.conf Sat Jul 19 05:30:44 2008 +0000 3.3 @@ -6,10 +6,10 @@ 3.4 ISO_NAME="slitaz-hacked" 3.5 #ISO_NAME="slitaz-cooking-`date +%Y%m%d`" 3.6 3.7 -# ISO image volum name. 3.8 +# ISO image volume name. 3.9 VOLUM_NAME="SliTaz LiveCD" 3.10 3.11 -# Name of the preparator. 3.12 +# Name of the preparer. 3.13 PREPARED="$USER" 3.14 3.15 # Path to the packages repository and the packages.list. 3.16 @@ -19,6 +19,6 @@ 3.17 # list of packages. 3.18 DISTRO="/home/slitaz/distro" 3.19 3.20 -# Path to the directory contening additional files 3.21 +# Path to the directory containing additional files 3.22 # to copy into the rootfs and rootcd of the LiveCD. 3.23 ADDFILES="$DISTRO/addfiles"