Patch: tazlito - Make comments consistent. Fix typos. |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/slitaz Archives
]
- To: slitaz <slitaz@xxxxxxxxxxxxxxxxxxx>
- Subject: Patch: tazlito - Make comments consistent. Fix typos.
- From: "Mike D. Smith" <mikedsmith25@xxxxxxxxx>
- Date: Mon, 14 Jul 2008 07:57:49 +0000
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:mime-version:content-type:content-transfer-encoding :content-disposition; bh=uL/O6MmdvstQDZNDEDXF7MLIduStWekppavwQCqez3s=; b=nEzHE/uBrbdt6G5+hMxliStymUsGE4qmEFFGEAFunGZCoOMqBibvpsi/tudTqA6FQm 3FVNPL//ojlawDbYQc3G7oErU04xcUjsU7IRA1iQbAP6BObo05GZ3KzTTSZ4t1XWi3mJ DMHfR5M3ybTnCB+A3nHo9tNjZgebBm8YzefG0=
- Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:mime-version:content-type :content-transfer-encoding:content-disposition; b=cGXF8UYTtfTUSWeU7mdFENSKgn1e+g7MJe6Rs3O5U7JnNdUV90TGGHeKcR1B750yLi f88C8x+30ttObpXQUUG4nUVO5zW9oVKjZRxIL1m6c+FgK0ZRxx6gDvb1tKt7Ao2paibL FG+5ljXxMJ5txtaKcO/vk0uSkMSZlezHCIF5I=
Here's a patch to make comments more consistent and fix some typos.
-Mike
-----
# HG changeset patch
# User Mike D. Smith <MikeDSmith25@xxxxxxxxx>
# Date 1216020265 0
# Node ID 54dc469bfa548eac647cf638355d501ab49b6a47
# Parent 2d058b0f4653676ed241c5068089a182b330c02f
Fixed typos
diff -r 2d058b0f4653 -r 54dc469bfa54 Makefile
--- a/Makefile Mon Jul 14 07:23:11 2008 +0000
+++ b/Makefile Mon Jul 14 07:24:25 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 2d058b0f4653 -r 54dc469bfa54 tazlito
--- a/tazlito Mon Jul 14 07:23:11 2008 +0000
+++ b/tazlito Mon Jul 14 07:24:25 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 a existing ISO image to hack it, create new initramfs
+# and/or 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
@@ -949,7 +949,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 "================================================================================"
@@ -1028,7 +1028,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 2d058b0f4653 -r 54dc469bfa54 tazlito.conf
--- a/tazlito.conf Mon Jul 14 07:23:11 2008 +0000
+++ b/tazlito.conf Mon Jul 14 07:24:25 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"
---
SliTaz GNU/Linux Mailing list.
Web site : http://www.slitaz.org/