# HG changeset patch # User Mike D. Smith # Date 1216445444 0 # Node ID 7f611e11e57e0dac8d8bc8571f9f249a8e565e99 # Parent 396fa5d930249d664635678b52ab5f3ae7b7ffd6 Fix typos and clean up comments diff -r 396fa5d93024 -r 7f611e11e57e Makefile --- a/Makefile Wed Jul 16 15:47:25 2008 +0000 +++ b/Makefile Sat Jul 19 05:30:44 2008 +0000 @@ -1,5 +1,5 @@ # Makefile for Tazlito. -# Check the README for more informations. +# Check the README for more information. # SBINDIR?=/sbin PREFIX?=/usr diff -r 396fa5d93024 -r 7f611e11e57e tazlito --- a/tazlito Wed Jul 16 15:47:25 2008 +0000 +++ b/tazlito Sat Jul 19 05:30:44 2008 +0000 @@ -1,10 +1,10 @@ #!/bin/sh # TazLito - SliTaz Live Tool. # -# Tazlito is a tool to help generating and configuring SliTaz LiveCD -# ISO images. You can creat a custom distro in one command from a list of -# packages, extract a existing ISO image to hack it, creat new initramfs -# and/or new ISO. Most commands must be run by root, expect the stats +# Tazlito is a tool to help generate and configure SliTaz LiveCD +# ISO images. You can create a custom distro in one command from a list of +# packages, extract an existing ISO image to hack it, create a new initramfs +# and/or a new ISO. Most commands must be run by root, except the stats # and the configuration file manipulation. # # (C) 2007-2008 SliTaz - GNU General Public License. @@ -83,7 +83,7 @@ gen-liveflavor Generate a live-CD description from current system. show-flavor Show live-CD description. get-flavor Get a flavor's list of packages. - extract-distro Extract and ISO to a directory and rebuild LiveCD tree. + extract-distro Extract an ISO to a directory and rebuild LiveCD tree. gen-distro Generated a Live distro and ISO from a list of packages. clean-distro Remove all files generated by gen-distro. addhacker Add Linux User Hacker to the current distro. @@ -132,7 +132,7 @@ done } -# exec hooks provided by some packages +# Execute hooks provided by some packages genisohooks() { local here=`pwd` @@ -152,7 +152,7 @@ fi } -# echo the package name if the tazpkg is already installed +# Echo the package name if the tazpkg is already installed installed_package_name() { local tazpkg @@ -160,9 +160,9 @@ local VERSION local EXTRAVERSION tazpkg=$1 - # try du find package name and version to be able + # Try to find package name and version to be able # to repack it from installation - # a dash (-) can exist in name *and* in version + # A dash (-) can exist in name *and* in version package=${tazpkg%-*} i=$package while true; do @@ -210,7 +210,7 @@ fi } -# Gen a new ISO image using isolinux. +# Generate a new ISO image using isolinux. gen_livecd_isolinux() { # Some packages may want to alter iso @@ -247,7 +247,7 @@ genisohooks final } -# Gen a new initramfs from the root file system. +# Generate a new initramfs from the root file system. gen_initramfs() { # Just in case CTRL+c @@ -309,7 +309,7 @@ distro_sizes } -# Creat an empty configuration file. +# Create an empty configuration file. empty_config_file() { cat >> tazlito.conf << "EOF" @@ -320,10 +320,10 @@ # Name of the ISO image to generate. ISO_NAME="" -# ISO image volum name. +# ISO image volume name. VOLUM_NAME="SliTaz" -# Name of the preparator. +# Name of the preparer. PREPARED="$USER" # Path to the packages repository and the packages.list. @@ -333,7 +333,7 @@ # list of packages. DISTRO="" -# Path to the directory contening additional files +# Path to the directory containing additional files # to copy into the rootfs and rootcd of the LiveCD. ADDFILES="$DISTRO/addfiles" @@ -369,7 +369,7 @@ echo "" ;; gen-config) - # Gen a new config file in the current dir or the specified + # Generate a new config file in the current dir or the specified # directory by $2. # if [ -n "$2" ] ; then @@ -439,7 +439,7 @@ distro_stats ;; extract-distro) - # Extract a ISO image to a directory and rebuild the LiveCD tree. + # Extract an ISO image to a directory and rebuild the LiveCD tree. # check_root ISO_IMAGE=$2 @@ -585,7 +585,7 @@ @ flavor description \033[1mExample: \033[0m -@ Developper tools for slitaz maintainers +@ Developer tools for slitaz maintainers + slitaz-toolchain + mercurial " @@ -746,7 +746,7 @@ [ -d $PACKAGES_REPOSITORY ] || mkdir -p $PACKAGES_REPOSITORY # Get the list of packages using cat for a file list. LIST=`cat $LIST_NAME` - # Verify if all packages in list are presents in $PACKAGES_REPOSITORY. + # Verify if all packages in list are present in $PACKAGES_REPOSITORY. REPACK="" DOWNLOAD="" for pkg in $LIST @@ -778,7 +778,7 @@ [ "$REPACK" = "n" -a "$DOWNLOAD" = "n" ] && exit 1 done - # mount cdrom to be able to repack boot-loader packages + # Mount cdrom to be able to repack boot-loader packages if [ ! -e /boot -a -n "$CDROM" ]; then mkdir $TMP_MNT if mount -r $CDROM $TMP_MNT 2> /dev/null; then @@ -807,17 +807,17 @@ PACKAGE=$(installed_package_name $pkg) mkdir -p $TMP_DIR if [ ! -f $PACKAGES_REPOSITORY/$pkg.tazpkg ]; then - # look for package in cache + # Look for package in cache if [ -f $CACHE_DIR/$pkg.tazpkg ]; then ln -s $CACHE_DIR/$pkg.tazpkg $PACKAGES_REPOSITORY - # look for package in running distribution + # Look for package in running distribution elif [ -n "$PACKAGE" -a "$REPACK" = "y" ]; then tazpkg repack $PACKAGE && \ mv $pkg.tazpkg $PACKAGES_REPOSITORY fi fi if [ ! -f $PACKAGES_REPOSITORY/$pkg.tazpkg ]; then - # get package from mirror + # Get package from mirror [ "$DOWNLOAD" = "y" ] && \ download $pkg.tazpkg && \ mv $pkg.tazpkg $PACKAGES_REPOSITORY @@ -955,7 +955,7 @@ status # Change permissions. # - echo -n "Chmodig all files in /home/hacker..." + echo -n "Chmoding all files in /home/hacker..." chown -R 500.500 $ROOTFS/home/hacker status echo "================================================================================" @@ -1034,7 +1034,7 @@ echo "" ;; usage|*) - # Clear and print usage also for all unknow commands. + # Clear and print usage also for all unknown commands. # clear usage diff -r 396fa5d93024 -r 7f611e11e57e tazlito.conf --- a/tazlito.conf Wed Jul 16 15:47:25 2008 +0000 +++ b/tazlito.conf Sat Jul 19 05:30:44 2008 +0000 @@ -6,10 +6,10 @@ ISO_NAME="slitaz-hacked" #ISO_NAME="slitaz-cooking-`date +%Y%m%d`" -# ISO image volum name. +# ISO image volume name. VOLUM_NAME="SliTaz LiveCD" -# Name of the preparator. +# Name of the preparer. PREPARED="$USER" # Path to the packages repository and the packages.list. @@ -19,6 +19,6 @@ # list of packages. DISTRO="/home/slitaz/distro" -# Path to the directory contening additional files +# Path to the directory containing additional files # to copy into the rootfs and rootcd of the LiveCD. ADDFILES="$DISTRO/addfiles"