Stefan Fiedler:

scripts/Build-Job

@@ -35,7 +35,7 @@ while [ "$1" ] ; do
 	-cfg)
 		config=$2 ; shift ; shift ;;
 	-*)
-		echo "Usage: $0 [ -cfg config ] { -daemon | job(s) }"
+		echo "Usage: $0 [ -cfg <config> ] { -daemon | <job(s)> }"
 		exit 1 ;;
 	*)
 		break ;;
@@ -56,7 +56,7 @@ if [ $daemon = 1 ] ; then
 	else
 		echo
 		echo "The build has been configured to use a command for"
-		echo "adding jobs (useing another job scheduler)."
+		echo "adding jobs (using another job scheduler)."
 		echo
 		exit 1
 	fi

scripts/Build-Pkg

@@ -64,6 +64,33 @@ help_msg() {
 	echo "$spacer [ -noclearsrc ]  [ -pkgdir <pkgdir> ]     \\"
 	echo "$spacer [ -id <id> ]  [ -debug ]  pkg-name(s)"
 	echo
+	echo " Build a single package. Warning: Re-building a package might overwrite or"
+	echo " remove configuration files; with the -update option modified files are backed"
+	echo " up and restored after the package build. In most cases the other options are"
+	echo " only needed by ./scripts/Build-Target when building the entire distribution."
+	echo
+	echo "	-0, -1, ..., -9	set build stage to 0, 1, ..., 9, respectively" 
+	echo "	-v		be verbose"
+	echo "	-xtrace		print additional xtrace (debug-)output to the"
+	echo "			build log file"
+	echo "	-chroot		create and use a chroot environment"
+	echo "	-root { <rootdir> | auto }	the root build directory to use;"
+	echo "					defaults to automatic setting"
+	echo "	-cfg <config>	the build configuration to use"
+	echo "	-update		backup/restore modified package files"
+	echo "	-prefix <prefix-dir>		the installation prefix for packages;"
+	echo "					defaults to automatic setting"
+	echo "	-norebuild	don't rebuild a previously successfully built package;"
+	echo "			if the \"retry broken\" Config option is set, don't"
+	echo "			rebuild unsuccessfully built packages, too" 
+	echo "	-noclearsrc	don't delete the package build directory (src.*)"
+	echo "	-pkgdir <pkgdir>	path to package build config (package/..),"
+	echo "				either absolute or relative to ROCK Linux"
+	echo "				sources directory" 	
+	echo "	-id <id>	use the given build id"
+	echo "	-debug		enable debug mode: setup everything and exit before"
+	echo "			the actual build"
+	echo
 	echo "Type './scripts/Help Build-Pkg' for details."
 	echo
 }
@@ -156,7 +183,7 @@ if [ "$chroot" = 1 ] ; then
 	x_mknod dev/null     c 1 3
 	x_mknod dev/zero     c 1 5
 	x_mknod dev/random   c 1 8
-	x_mknod dev/uramdom  c 1 9
+	x_mknod dev/urandom  c 1 9
 	x_mknod dev/loop/0   b 7 0 
 	x_mknod dev/loop/1   b 7 1 
 	x_mknod dev/loop/2   b 7 2 
@@ -538,13 +565,11 @@ fi
 
 echo_status "Preparing build in src.$xpkg.$id"
 
+mkdir -p $builddir; chmod 700 $builddir
 if [ $clear_src = 1 ] ; then
-	mkdir -p $builddir; chmod 700 $builddir
 	if [ "$ROCKCFG_SRC_TMPFS" = 1 ]; then
 		mount -t tmpfs -o $ROCKCFG_SRC_TMPFS_OPT none $builddir
 	fi
-else
-	mkdir -p $builddir; chmod 700 $builddir
 fi
 
 if [ "$xroot" != "$root" ] ; then

scripts/Build-Target

@@ -25,7 +25,7 @@
 #   Run this command from the ROCK directory as ./scripts/Build-Target
 #   after running the ./scripts/Config and ./scripts/Download commands.
 # 
-#   It compiles/builds all the packages and stores them tar balls suitable
+#   It compiles/builds all the packages and stores them as tar balls suitable
 #   for distribution. 
 # 
 #   This script is the ROCK work-horse. It builds in a chroot environment
@@ -43,8 +43,21 @@ while [ "$1" ] ; do
 		-job)		build_only_this_job=$2 ; shift ; shift ;;
 		-daemon)	daemon_mode=1 ; shift ;;
 		-nodaemon)	daemon_mode=0 ; shift ;;
-		*)		echo "Usage: $0 [ -daemon ] [ -cfg config ]" \
-				     "[ -job <stage>-<package> ]" ; exit 1 ;;
+		*)		echo "Usage: $0 [ -daemon ] [ -cfg <config> ]" \
+				     "[ -job <stage>-<package> ]" 
+				echo
+				echo " Compile/build all packages for a given configuration and store them as tar"
+				echo " balls suitable for distribution."
+				echo " This script is the ROCK work-horse. It builds in a chroot environment"
+				echo " (stage 2..9) and goes through a number of build stages." 
+				echo " Run this command from the ROCK directory as ./scripts/Build-Target after"
+				echo " running the ./scripts/Config and ./scripts/Download commands."
+				echo
+				echo "	-cfg <config>	the build configuration to use; defaults to 'default'"
+				echo "	-daemon		run as daemon in the background"
+				echo "	-job <stage>-<package>	build only one job: the given package"
+				echo "				in the given stage" 
+				exit 1 ;;
 	esac
 done
 

scripts/Build-Tools

@@ -31,8 +31,15 @@ while [ "$1" ] ; do
 	-cleanup)  cleanup=1 ; shift ;;
 	-cfg)      config=$2 ; shift ; shift ;;
 	-[0-9])    options="$options $1" ; stagelevel=${1#-} ; shift ;;
-	*)         echo "Usage: $0 [ -cfg config ] [ -0 | -9 ] \\"
-	           echo "       ${0//?/ } [ -cleanup ]" ; exit 1 ;;
+	*)         echo ; echo "Usage: $0 [ -cfg <config> ] [ -0 | -1 | ... |  -9 ] \\"
+	           echo "       ${0//?/ } [ -cleanup ]"
+                   echo 
+		   echo " Create various helper applications needed by Build-Pkg and other scripts."
+		   echo
+		   echo "	-cfg <config>	the configuration to use"
+                   echo "	-0 to -9	set stagelevel"
+		   echo "	-cleanup	force a rebuild of files"
+	           echo ; exit 1 ;;
     esac
 done
 

scripts/Check-Deps-3

@@ -46,6 +46,8 @@ BEGIN {
 	if ( ! ARGV[3] ) {
 		print "Usage: ./scripts/Check-Dep-3 " \
 			"<stagelevel> <package-name> <pkg-list-file>";
+		print " Show packages in the package list file that depend on";
+		print " the given package, using dependencies from scripts/dep_db.txt.";
 		exit 1;
 	}
 

scripts/Check-PkgFormat

@@ -40,6 +40,10 @@ if [ "$1" != "${1#-}" -o $# -eq 0 ] ; then
 	echo "Usage: $0 <package-names>"
 	echo "or     $0 -repository <repository-names>"
 	echo "or     $0 -all"
+	echo
+	echo " Do a few very simple tests to auto-detect errors in the package *.desc and"
+	echo " *.conf files."
+	echo " Run tests on single packages, repositories, or all packages."
 	exit 1
 fi
 

scripts/Check-PkgVersion

@@ -32,6 +32,11 @@ fi
 if [ "$1" != "${1#-}" -o $# -eq 0 ] ; then
 	echo "Usage: $0 <package-names>"
 	echo "or     $0 -repository <repository-names>"
+	echo 
+	echo " Search for new source files for the given packages or repositories. Output"
+	echo " will be written to *.msg files in checkver/. Old *.msg files will"
+	echo " automatically be removed on every run."
+	echo 
 	exit 1
 fi
 

scripts/Check-System

@@ -23,7 +23,12 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 if [ "$1" ] ; then
-	echo "Usage: $0" ; exit 1
+	echo "Usage: $0"
+	echo
+	echo " Check the build system for and warn about various conditions that will likely"
+	echo " cause ROCK to not work properly."
+	echo
+	exit 1
 fi
 
 found_error=0

scripts/Cleanup

@@ -35,7 +35,22 @@ while [ "$1" ] ; do
 	    -nocheck)
 		nocheck=1   ; shift ;;
 	    -*)
-		echo "Usage: $0 [ -full ] [ -nocheck ] [ dir(s) ]"
+		echo "Usage: $0 [ -full ] [ -nocheck ] [ <dir(s)> ]"
+		echo
+		echo " Cleanup the build environment, deleting the directories src, src.*,"
+		echo " build/*/ROCK/src.* and various temporary/backup files."
+		echo " Also check for old liggering files."
+		echo " Without options, remove src and all src.* and build/*/ROCK/src.*"
+		echo " directories, and all temporary/backup files, and perform checks for old"
+		echo " liggering files."
+		echo " If directories are given, delete only them. Directories used by ROCK scripts"
+		echo " at the moment are recognized and not deleted."
+		echo
+		echo "	-full			delete full build directories, "
+		echo "				e.g. build/desktop-*"
+		echo "	-nocheck		don't delete temporary/backup files and don't"
+		echo "				check for old liggering files" 
+ 		echo
 		exit 1 ;;
 	    *)
 		break ;;

scripts/Config

@@ -52,7 +52,18 @@ while [ "$1" ] ; do
 	    *)
 		echo
 		echo "Usage: $0 [ -delete | -oldconfig ] [ -cfg <config> ]"
+		echo " Create and modify build configurations for the other"
+		echo " scripts, e.g. Download, Build-Target, and Emerge-Pkg."
 		echo
+		echo "	-cfg <config>	use <config> as the configuration name. If this option"
+		echo "			is not set the name 'default' is used. If no"
+		echo "			configuration by this name exists, one with default"
+		echo "			settings is created."
+		echo "	-delete		delete the specified configuration"
+		echo "	-oldconfig	run without a menu-based interface; changes to settings"
+		echo "			in configuration files have to be made manually before"
+		echo "			./scripts/Config recreates the whole configuration"
+		echo  
 		echo "Other options:"
 		echo "	-profile	create a config.profile with profiling data"
 		echo "	-nobashmod	don't use the bash config helper plugin"

scripts/Create-AutoPatch

@@ -27,7 +27,10 @@ temp="`mktemp`"
 
 if [ -z "$1" ] ; then
 	echo
-	echo "Usage: $0 {command} {file1} [ {file2} [ .. ] ]"
+	echo "Usage: $0 <command> <file1> [ <file2> [ .. ] ]"
+	echo
+	echo "Evaluate the command with each file as input, and return differences"
+	echo "between original files and evaluation output."
 	echo
 	echo "Example: ./scripts/Create-AutoPatch \\"
 	echo "         'sed s,clifford@clifford.at,clifford@rocklinux.org,' \\"

scripts/Create-CkSumPatch

@@ -32,14 +32,24 @@ while [ "$1" ]; do
 	-repository) files="$files `echo package/$2/*/*.desc`" ; shift ; shift ;;
 	-*)
 	    echo "Usage:"
-	    echo "./scripts/Create-CkSumPatch [options] <package-name>"
-	    echo "./scripts/Create-CkSumPatch [options] <target-name>"
-	    echo "./scripts/Create-CkSumPatch [options] <file-path>"
-	    echo "./scripts/Create-CkSumPatch [options] -repository <repo-name>"
-	    echo " "
+	    echo "./scripts/Create-CkSumPatch [options] <package-name(s)> <target-file(s)> \\"
+	    echo "                            <desc-file(s)> -repository <repository>"
+	    echo 
+	    echo " Compute checksums for (source) files mentioned in .desc files and output"
+	    echo " a patch which can be applied to the ROCK sources to update the checksums."
+	    echo " Only checksums for files that have the checksum set to 0 will be computed."	    	
+	    echo " Process single packages, a single repository, single .desc files or files"
+	    echo " from a target directory (e.g. target/bootdisk/download.txt)."
+	    echo
 	    echo "Options:"
-	    echo "    -override        Create new cksum if old one should be valid."
-	    echo "    -help            This."
+	    echo "	-override	create new checksums even if old ones are not equal 0;"
+	    echo "			checksums set to X are not changed anyhow"			  	
+	    echo "	-help		show this help text"
+	    echo
+	    echo "Example: create a cksum patch and apply it"
+	    echo " ./scripts/Create-CkSumPatch gcc -repository stf target/bootdisk/download.txt \\"
+	    echo " package/base/dietlibc/dietlibc.desc | patch -p0" 	
+	    echo
 	    exit
 	    ;;
 	target/*)    files="$files $1" ; shift ;;
@@ -101,7 +111,7 @@ cksum_file() {
     rm -f /tmp/$$
 }
 
-echo "Creating cksum.patch ..." >&2
+echo "Creating checksum patch ..." >&2
 
 for f in $files; do
     cksum_file $f

scripts/Create-CopyPatch

@@ -45,6 +45,25 @@ EOT
 
 echo "Creating copy.patch (this may take a while) ..." >&2
 
+if [ $1 == -help ] ; then
+	echo 
+	echo "Usage: ./scripts/Create-CopyPatch [ <directories> ]"
+	echo
+	echo " Update copyright notes in files that already contain such a note."
+	echo " The first and last line of ROCK copyright notes are marked by the"
+	echo " --- ROCK-COPYRIGHT-NOTE-BEGIN ---"
+	echo " and"
+	echo " --- ROCK-COPYRIGHT-NOTE-END ---"
+	echo " respectively."
+	echo " Files that contain the line"
+	echo " --- NO-ROCK-COPYRIGHT-NOTE ---"
+	echo " are not updated."
+	echo " If no directories are given, process Documentation, architecture,"
+	echo " misc, package, scripts and target."  
+	echo
+	exit
+fi
+
 [ $# = 0 ] && set Documentation/. architecture/. misc/. \
                   package/. scripts/. target/.
 

scripts/Create-DescPatch

@@ -30,8 +30,16 @@ if [ "$1" = "-repository" ] ; then
 fi
 
 if [ "$1" != "${1#-}" -o $# -eq 0 ] ; then
-	echo "Usage: $0 <package-names>"
-	echo "or     $0 -repository <repository-names>"
+	echo
+	echo "Usage: $0 <package(s)>"
+	echo "or     $0 -repository <repositories>"
+	echo
+	echo " \"Normalize\" package .desc files for single packages or repositories:"
+	echo " group tags as described in Documentation/Developers/PKG-DESC-FORMAT,"
+	echo " and remove extra empty lines and commented out tags."
+	echo " The files are not modified directly, instead a patch is ouput that"
+	echo " can be used to apply changes."
+	echo 
 	exit 1
 fi
 

scripts/Create-Diff

@@ -31,7 +31,7 @@ fi
 if [ "$#" -lt 2 ] ; then
 	echo ; echo "  Usage: $0 [ -editor <editor> ] <old-dir> <new-dir> [ {file|directory} ]"
 	echo
-	echo "  Creates a unified diff over two ROCK source trees. You can"
+	echo "  Create a unified diff over two ROCK source trees. You can"
 	echo "  send this diff to the mailing list if you want your changes"
 	echo "  to be included."
 	echo

scripts/Create-ErrList

@@ -108,10 +108,47 @@ while [ "$1" ] ; do
 
 	    -*)
 x="${0//?/ }" ; x="${x#         }"
-echo "Usage: $0 [ -cfg config ] [ -repository repository ]  \\"
-echo "  $x [ -copydir copydir | -movedir movedir ] [ -repstat ]      \\"
-echo "  $x [ -stage stage ] [ -logdir logdir ] [ -[full|new]delete ] \\"
-echo "  $x [ -updated ] [ -showerr [ -showtree ] [ -showdepc ] | <package> ]"
+echo "Usage: $0 [ -newdelete ] [ -dry-run ]"
+echo "       $0 [ -repstat ]"
+echo "       $0 [ -[full]delete ] [ -remove ] <package(s)>"
+echo "       $0 [ -cfg <config> ] [ -dry-run ] \\"
+echo "  $x [ -repository <repositories> ] [ -copydir <copydir> ] \\" 
+echo "  $x [ -movedir <movedir> ] [ -logdir <logdir> ] \\"
+echo "  $x [ -stage <stage(s)> ] [ -[full]delete ] \\"
+echo "  $x [ -updated ] [ -showdepc ] [ -showerr [ -showtree ] ]"
+echo 
+echo " Create summaries of package builds, print statistics or schedule packages"
+echo " for a rebuild"
+echo
+echo "	-newdelete		schedule updated packages for a rebuild"
+echo "	-dry-run		don't delete anything; just print what"
+echo "				would happen"
+echo "	-repstat		print some build statistics on repositories"
+echo "	-delete			delete logs of failed builds"
+echo "				(for given packages)"
+echo "	-fulldelete		delete all build logs and log directory entries"
+echo "				(for given packages)"
+echo "	-remove			schedule given packages for a rebuild"
+echo "	-cfg <config>		check this target build for errors;"
+echo "				defaults to 'default'"
+echo "	-repository <repositories>	check only packages from the given"
+echo "					repositories"
+echo "	-copydir <copydir>	copy logs of failed builds to this directory"
+echo "	-movedir <movedir>	move logs of failed builds to this directory"
+echo "	-logdir <logdir>	the log directory to use; defaults to "
+echo "				build/<ROCKCFG-ID>/var/adm/logs"
+echo "	-stage <stage>		process package builds from the given stages;"
+echo "				defaults to '0123456789' (all stages)"
+echo "	-updated		process updated instead of failed packages"
+echo "	-showerr		show the last build log lines for each"
+echo "				processed package"
+echo "	-showtree		show a dependency tree"
+echo "	-showdepc		show the number of packages that depend on a"
+echo "				processed package"
+echo
+echo " If packages are given without additional options, logs of failed builds are"
+echo " opened with 'less'."
+echo
 		exit 1 ;;
 
 	    *)

scripts/Create-ISO

@@ -23,8 +23,21 @@ eval `grep rockver scripts/parse-config`
 
 if [ $# -eq 0 ] ; then
 	echo
-	echo "Usage: $0 [ -size MB ] [ -source ] [ -mkdebug ] [ -nomd5 ] ISO-Prefix \\"
-	echo "       ${0//?/ } Config [ Config [ .. ] ]"
+	echo "Usage: $0 [ -size <MB> ] [ -source ] [ -mkdebug ] [ -nomd5 ] \\"
+	echo "       ${0//?/ } <ISO-Prefix> <Config> [ <Config> [ .. ] ]"
+	echo
+	echo " Create ISO images ready to burn on CD/DVD from one or more target builds." 
+	echo " Targets have to be built using ./scripts/Build-Target before you can create"
+	echo " ISO images from them."
+	echo
+	echo "	-size  <MB>	limit the size of images to <MB> MB; default is 600"
+	echo "	-source		include package sources on the images"
+	echo "	-mkdebug	create a small debug script for every image"
+	echo "	-nomd5		don't add md5 checksums to images"
+	echo
+	echo "	<ISO-Prefix> 	the name of the resulting images"
+	echo "	<Config>  	the target builds to include; the first has to be a"
+	echo "			bootdisk target for the first image to be bootable" 
 	echo
 	echo "E.g.: $0 mycdset install generic"
 	echo
@@ -282,7 +295,9 @@ if [ "\$1" -a -z "\${1//[0-9]/}" ] ; then
 	losetup /dev/loop/\$1 ${isoprefix}_cd$x.iso
 	[ "\$2" ] && mount /dev/loop/\$1 \$2
 else
-	echo "Usage: \$0 loopback-dev-nr [ mount-point ]"
+	echo "Usage: \$0 <loopback-dev-nr> [ <mount-point> ]"
+	echo " Mount the corresponding ISO image at the given mount point using the given"
+	echo " loopback device. If no mount point is given, the mount step is skipped."
 	exit 1
 fi
 EOT

scripts/Create-Links

@@ -35,7 +35,10 @@ while [ "$1" ] ; do
 echo
 echo "Usage: ./scripts/Create-Links [ -config ] [ -build ] target-dir"
 echo
-echo "Type './scripts/Help Create-Links' for details."
+echo " Create symlinks from your ROCK Linux base directory to another directory."
+echo " This can be useful if you have the ROCK sources on one harddisk (NFS Share,"
+echo " etc) and want to build somewhere else."
+echo " Type './scripts/Help Create-Links' for details."
 echo
                 exit 1 ;;
 	*)

scripts/Create-ParaSim

@@ -30,8 +30,18 @@ while [ "$1" ] ; do
                 -cfg)   config=$2 ; shift ; shift ;;
                 -jobs)  jobs=$2   ; shift ; shift ;;
                 -x11)   x11=1     ; shift ;;
-                *)      echo "Usage: $0 [ -cfg config ] [ -x11 ]" \
-			     "[ -jobs 1,4,8 ]"
+                *)      echo "Usage: $0 [ -cfg <config> ] [ -x11 ]" \
+			     "[ -jobs <N>[,<N>[,...]]]"
+			echo
+			echo " \"Simulate\" a parallel build and output a graph showing how many parallel"
+			echo " jobs are available for building in which phase of the build."
+			echo
+			echo "	-cfg <config>		the configuration to use"
+			echo "	-x11			graph the results with 'gnuplot'"
+			echo "	-jobs <N>[,<N>[,...]]]  compare the reference build to cluster builds"
+			echo "				with N nodes"
+			echo
+			echo " For details, see Documentation/BUILD-CLUSTER."
 			exit 1 ;;
         esac
 done    

scripts/Create-ParaStatus

@@ -27,7 +27,14 @@ config=default
 while [ "$1" ] ; do
         case "$1" in
                 -cfg)   config=$2 ; shift ; shift ;;
-                *)      echo "Usage: $0 [ -cfg config ]" ; exit 1 ;;
+                *)      echo
+			echo "Usage: $0 [ -cfg <config> ]"
+			echo
+			echo " Show the current status of a parallel build."
+			echo
+			echo "	-cfg <config>	the configuration to use"
+			echo
+			exit 1 ;;
         esac
 done    
 

scripts/Create-PkgUpdPatch

@@ -26,13 +26,15 @@ if [ "$1" != "${1#-}" ] ; then
 	cat << EOT >&2
 
 $0:
-Script for automatically creating package-update patches
+Automatically create package-update patches.
 
 Input format (e.g.): automake-1.5, bind-9.2.0rc3, binutils-2.11.90.0.31,
                      gettext-0.10.40, gnome-applets-1.4.0.4
 
 Output format: unified diff for the .desc files
 
+Type ./scripts/Help Create-PkgUpdPatch for details."
+
 EOT
 	exit 1
 fi

scripts/Create-SrcTar

@@ -22,6 +22,15 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
+if [ $1 == -help ] ; then
+	echo
+	echo "Usage: ./scripts/Create-SrcTar"
+	echo
+	echo " Create a .tar.bz2 file containing the ROCK Linux sources. This script is"
+	echo " used by the ROCK Linux core developers when releasing snapshots or releases."
+	echo ; exit 
+fi
+
 eval "`grep -A 10 '\[BEGIN\]' scripts/parse-config | grep -B 10 '\[END\]'`"
 
 echo -n 'Creating source tar ... '

scripts/Create-UpdList

@@ -32,7 +32,17 @@ while [ "$1" ] ; do
 	    -ignore-chksum)
 		ignore_chksum=1 ; shift ;;
             *)
-                echo "Usage: $0 [ -cfg config ] [ -ignore-chksum ]" ; exit 1 ;;
+                echo ; echo "Usage: $0 [ -cfg <config> ] [ -ignore-chksum ]"
+		echo
+		echo " Create a list of packages which are active in the current configuration and"
+		echo " have changed since the binaries installed on the local system have been"
+		echo " generated. The compare is done using the package source checksums stored"
+		echo " in /var/adm/packages/<package-name>."
+		echo
+		echo "	-cfg <config>	only packages active in this configuration are checked"
+		echo "	-ignore-chksum	ignore checksums on package source directories when"
+		echo "			determining changed packages"
+		echo ; exit 1 ;;   
         esac
 done
 

scripts/Download

@@ -33,30 +33,67 @@ umask 022
 
 . scripts/functions
 
-if [ "$1" = '--help' ] ; then
+if [ "$1" = '-help' ] ; then
 	{ echo
 	echo "Usage:"
 	echo
-	echo " ./scripts/Download [options] [ Package(s) ]"
-	echo " ./scripts/Download [options] [ Desc file(s) ]"
-	echo " ./scripts/Download [options] -repository Repositories"
-	echo " ./scripts/Download [options] { -all | -required }"
+	echo " ./scripts/Download [ options ] [ <Package(s)> ]"
+	echo " ./scripts/Download [ options ] [ <Desc file(s)> ]"
+	echo " ./scripts/Download [ options ] -repository <Repositories>"
+	echo " ./scripts/Download [ options ] { -all | -required }"
+	echo 
+	echo " Download files required for given packages, package description files, package"
+	echo " repositories, or build configurations."
+ 	echo " On default, this script auto-detects the best ROCK Linux mirror."
+	echo " See '-mirror none' output for help on bypassing the official mirrors."
 	echo
-	echo " Where [options] is an alias for:"
-	echo "    [ -cfg <config> ] [ -nock ]  [ -alt-dir <AlternativeDirectory> ]"
-	echo "    [ -mirror <URL> | -check ]  [ -try-questionable ]  [ -notimeout ]"
-	echo "    [ -longtimeout ]  [ -curl-opt <curl-option>[:<curl-option>[:..]] ]"
+	echo "	-all		download all files for a build configuration"
+	echo "	-required	download only files for packages that will be built in"
+	echo "			the given configuration" 
+	echo
+	echo " Where [ options ] is an alias for:"
+	echo "    [ -cfg <config> ] [ -nock ] [ -alt-dir <AlternativeDirectory> ]"
+	echo "    [ -mirror <URL> | -check ] [ -try-questionable ]  [ -notimeout ]"
+	echo "    [ -longtimeout ] [ -curl-opt <curl-option>[:<curl-option>[:..]] ]"
 	echo "    [ -proxy <server>[:<port>] ] [ -proxy-auth <username>[:<password>] ]"
 	echo "    [ -copy ] [ -move ]"
 	echo
-	echo " On default, this script auto-detects the best ROCK Linux mirror."
-	echo
-	echo " Mirrors can also be a local directories in the form of 'file:///<dir>'."
+	echo "	-cfg <config>	download files for the given configuration"
+	echo "	-nock		skip checksum checks (don't use lightly)"
+	echo "	-alt-dir <AlternativeDirectory>"
+	echo "			check for files to download also in the given directory"
+	echo "	-mirror <URL>	set the download mirror to use"
+	echo "			Mirrors can also be local directories in the form"
+	echo "			of 'file:///<dir>'"
+	echo "	-check		check checksums only; don't download files"
+	echo "	-try-questionable	also try to download from URLs marked as"
+	echo "				questionable"
+	echo "	-notimeout	don't apply timeout settings to curl"
+	echo "	-longtimeout	apply long timeout settings"
+	echo " 			By default, timeouts for connection and speed-limit"
+	echo "			are set"
+	echo "	-curl-opt <curl-option>		pass option(s) to curl"
+	echo "	-proxy <server>[:<port>]"
+	echo "	-proxy-auth <username>[:<password>]" 
+	echo "			pass proxy and proxy authentication to curl"
+	echo " 			Warning: authentication can be seen with ps!"    
+	echo "	-copy		copy files from the old download directory layout,"
+	echo "			if existent"
+	echo "	-move		move files instead"
+	echo "			Default is to link files, if existent, from the old"
+	echo "			layout to the new one"
 	echo
-	echo " ./scripts/Download -mk-cksum Filename(s)"
+	echo " ./scripts/Download -mk-cksum <Filename(s)>"
 	echo " ./scripts/Download [ -list | -list-unknown | -list-missing | -list-cksums ]"
 	echo
-	echo "See '-mirror none' output for help on bypassing the official mirrors."
+	echo "	-mk-cksum <Filenames>	calculate checksums on files as used in package"
+	echo "				descriptions"
+	echo "	-list		all files a complete download directory would contain"
+	echo "	-list-cksums	as -list, with an checksum for each file"
+	echo "	-list-unknown	files in the download directory that are not in any"
+	echo "			package description, e.g. old files"
+	echo "	-list-missing	files in package descriptions that are not"
+	echo "			downloaded (yet)" 
 	echo ; } >&2
 	exit 1
 fi

scripts/Emerge-Pkg

@@ -46,11 +46,27 @@ help_msg() {
 	echo "Usage: ./scripts/Emerge-Pkg" \
 	             "[ -cfg <config> ] [ -dep ] [ -dry-run ]"
 	echo "$spacer [ -noupdate ] [ -ignore-chksum ] [ -norebuild ]"
-	echo "$spacer [ -repository repository-name ] [ -debug ]"
+	echo "$spacer [ -repository <repository-name> ] [ -debug ]"
 	echo "$spacer [ pkg-name(s) ]"
-	echo "pkg-name(s) are only optional if a repository is specified!"
 	echo
-	echo "Type './scripts/Help Emerge-Pkg' for details."
+	echo " Compile/build single packages or whole repositories on the host system. By"
+	echo " default only new/updated packages will be built. Modified files of packages"
+	echo " (e.g. configuration files) to build will be backed up before and restored"
+	echo " after each build."
+	echo
+	echo "	-cfg <config>	the configuration to use"
+	echo "	-dep		also build packages specified packages depend on" 
+	echo "	-dry-run	don't actually build packages; just print what"
+	echo "			would happen"
+	echo "	-noupdate	don't backup/restore modified package files"
+	echo "	-ignore-chksum	ignore checksums on package source directories (i.e."
+	echo "			package/base/*/) when looking for updated packages"
+	echo "	-norebuild	don't build a package if its previous build failed"	
+	echo "	-repository <repository-name>"
+	echo "			build all packages in the specified repository"
+	echo "	-debug		print various debug information"
+	echo
+	echo " pkg-name(s) are only optional if a repository is specified!"
 	echo
 }
 

scripts/Update-Src

@@ -30,14 +30,15 @@ srcroot="rsync://www.rocklinux.org/rock-2.1"
 
 help_msg() {
 	echo
-	echo "$0 can be used to update the entire ROCK Linux tree"
-	echo "to the current development snapshot using 'rsync'."
+	echo "Usage: $0 [ -srcroot <URL> ]"
 	echo
-	echo "Warning: It may remove changes you have made!"
+	echo " Update the entire ROCK Linux tree to the current development snapshot using"
+	echo " 'rsync'. It does not update your tar balls, that is you still have to run"
+	echo " ./scripts/Download for updated packages."
 	echo
-	echo "Usage: $0 [ -srcroot URL ]"
+	echo " Warning: It will remove changes you have made to the source tree!"
 	echo
-	echo "The default for -srcroot is '$srcroot'."
+	echo " The default for -srcroot is '$srcroot'."
 	echo
 	exit 1
 }

scripts/Update-System

@@ -31,10 +31,23 @@ while [ "$1" ] ; do
 	    -ignore-chksum)
 		options="$options -ignore-chksum" ; shift ;;
             *)
-                echo "Usage: $0 [ -cfg config ] [ -ignore-chksum ] " ; exit 1 ;;
+		echo
+                echo "Usage: $0 [ -cfg config ] [ -ignore-chksum ] " 
+		echo
+		echo " Update (re-build) all packages on the local system for which newer versions"
+		echo " are available."
+		echo " Warning: this script is unusable at the moment and explicitly disabled!"
+		echo
+		echo "	-cfg config	the build configuration to use"
+		echo "	-ignore-chksum	ignore checksums on package source directories"
+		echo "			(e.g. package/base/glibc/) when looking for new packages"
+		echo
+		exit 1 ;;
         esac
 done
 
+exit 1
+
 . scripts/parse-config
 
 ./scripts/Create-UpdList -cfg $config $options | grep -v "Not installed." | cut -f1 -d: | \