update packages helps

bin/gpull

@@ -5,8 +5,10 @@
 load_mod git
 
 if [ "$1" = "-h" ] ; then
-	echo "gpull [args] - do git pull --rebase"
-	echo "Use: gpull without parameters"
+	echo "gpull - do git pull --rebase"
+	echo "Use: gpull [GEAR] [branch]"
+	echo "     gpull without parameters or with branch name"
+	echo "     gpull git.eter - for pull from git.eter gear repo"
 	exit 1
 fi
 

bin/gpush

@@ -8,7 +8,7 @@ test -r "$1" && fatal "Do not need any files in params"
 
 if [ "$1" = "-h" ] ; then
 	echo "gpush - publish current project repo remote git repo"
-	echo "Use: gpush [-f|--force] [-a|--all] [project name] [target branch]"
+	echo "Use: gpush [-f|--force] [-a|--all] [GEAR] [project name] [target branch]"
 	exit 1
 fi
 

bin/rpmbb

@@ -33,11 +33,12 @@ phelp()
 	echog "$Descr"
 	echog "$Usage"
 	echog "Options:"
-	echog " -c - start from compile stage"
-	echog " -i - install and package"
-	echog " -p - packaging installed files into package"
+	echog " -i - skip build, but do install and package"
 	echog " -r - find build requires"
 	echog " -R - find build requires with -bi"
+	echog "Ext. options:"
+	echog " -c - start from compile stage"
+	echog " -p - packaging installed files into package"
 }
 
 while getopts :hciprR opt; do

bin/rpmbph

@@ -261,11 +261,11 @@ phelp()
 	echo  "Use rpmbph -$CURRENTBRANCHNAME for backport to ALT $CURRENTBRANCHNAME and so on"
 	echog "Options:"
 	echog " -r - remote build"
-#	echog " -m - send result via e-mail"
-	echog " -u/-U - sign and upload after build"
+	echog " -u - sign and upload after build"
 	echog " -n - do not build in hasher (use first in the list)"
 	echog " -i - install built packages in test hasher"
 	echog " -v - more verbose"
+#	echog " -m - send result via e-mail"
 }
 
 

bin/rpmbs

@@ -41,16 +41,17 @@ phelp()
 	echog "$Descr"
 	echog "$Usage"
 	echog "Options:"
-	echog " -s - sign package(s) and move it to upload dir (ETERDESTSRPM)"
+	echog " -u - sign and run gear build task after build"
+	echog " -a TASK - sign package(s), push/upload it and add to task TASK"
+	echog " -l - lazy cleanup (clean before build, not after)"
+	echog "Ext. options:"
 	echog " -c - only sign package(s) with checking"
-	echog " -u - sign package(s), upload it and run build"
-	echog " -a TASK - sign package(s), update it and add to task TASK"
-#	echog " -U - sign package(s) and upload it to Incoming (updates)"
-#	echog " -d - remove package(s) from SRPMS and Incoming"
-	echog " -l - lazy cleanup (before build, not after)"
+	echog " -s - sign package(s) and move it to upload dir (ETERDESTSRPM)"
 	echog " -n - do not check with sisyphus_check before upload"
 	echog " -o - create nosrc.rpm package"
 	echog " -z - create src.rpm with compatible gzip compression"
+#	echog " -U - sign package(s) and upload it to Incoming (updates)"
+#	echog " -d - remove package(s) from SRPMS and Incoming"
 }
 
 while getopts :hscuUdnoa:z opt; do

bin/rpmbsh

@@ -31,13 +31,14 @@ phelp()
 	echog "$Descr"
 	echog "$Usage"
 	echog "Options:"
-	echog " -r - remote build"
-	echog " -t - make temporary commit before build (rpmbb like behavior)"
-	echog " -u - sign and upload after build"
-	echog " -s - sign and and copy to upload dir (ETERDESTSRPM) after build"
-	echog " -i - install built packages in test hasher"
-	echog " -l - lazy cleanup (before build, not after)"
+	echog " -r - remote build (on $BUILDSERVER host)"
+	echog " -u - sign and run gear build task after build"
+	echog " -i - install built packages in test hasher (via loginhsh -t)"
+	echog "Ext. options:"
 	echog " -c - build without stuff (previous built packages)"
+	echog " -s - sign and and copy to upload dir (ETERDESTSRPM) after build"
+	echog " -t - make temporary commit before build (rpmbb like behavior)"
+	echog " -l - lazy cleanup (clean before build, not after)"
 }
 
 while getopts :hrulsimt opt; do

bin/rpmbugs

@@ -40,16 +40,19 @@ show_bugbyid()
 #parse_cmd_pre "$@"
 
 if [ "$1" = "-h" ]; then
-	echog "rpmbugs [-t] spec | bug number | package name | -qf command | /path/to/file - open bugs in BROWSER"
+	echog "rpmbugs - open bugs in BROWSER"
+	echog "rpmbugs [-t] spec | bug number | package name | -qf command_name | /path/to/file"
+	echog "Options:"
+	echog " -t - list in text console"
 	exit 0
 fi
 
-if [ "${1}" = "-n" ] ; then
+if [ "$1" = "-n" ] ; then
 	shift
 	NEWBUG=1
 fi
 
-if [ "${1}" = "-t" ] ; then
+if [ "$1" = "-t" ] ; then
 	shift
 	TEXT=1
 	which links >/dev/null && BROWSER=links
@@ -58,7 +61,7 @@ fi
 test -z "$DISPLAY" && TEXT=1
 
 SPECLIST=$@
-if [ "${1}" = "-qf" ]
+if [ "$1" = "-qf" ]
 then
 	shift
 	SPECLIST=$(rpmqf "$1")

bin/rpmgp

@@ -375,12 +375,7 @@ then
 	# it is src.rpm package
 	SRCRPM=$1
 else
-	if [ -z "${1/*rpm/}" ] ; then
-		# it is rpm package (locale placed?)
-		SRCRPM=$(querypackage $1 "" "%{SOURCERPM}\n")
-	else
-		SRCRPM=$(querypackage $1 "" "%{SOURCERPM}\n")
-	fi
+	SRCRPM=$(querypackage $1 "" "%{SOURCERPM}\n")
 fi
 test -z "$SRCRPM" && fatal "Cannon find package for $1"
 echog "Try to download $SRCRPM"

bin/rpmgs

@@ -21,19 +21,19 @@ GETSOURCE=""
 LOADLIST="0"
 
 #############################
-Usage="Usage: $name [-a -r ] spec ... | spec new_version"
+Usage="Usage: $name [-a -r ] spec [new_version]"
 function mygetopts()
 {
 name=${0##*/}
-Descr="$name - get sources for spec"
+Descr="$name - get sources by spec / repository"
 
 phelp()
 {
 	echog "$Descr"
 	echog "$Usage"
-	echog "You can run rpmgs file.spec new_version for set new version and download it"
+	echog "You can run 'rpmgs file.spec new_version' for set new version and download it"
 	echog "Options:"
-	echog " -a - get all source (not only 0)"
+	echog " -a - get all source (not only Source|Source0)"
 	echog " -f - force download (remove source before download)"
 }
 

bin/rpmpub

@@ -16,6 +16,9 @@ load_mod spec rpm etersoft
 if [ "$1" = "-h" ]; then
 	echog "rpmpub - Etersoft specific script for publish gear repo to target ftp dir"
 	echog "Usage: rpmpub [-r PROJECTVERSION ] [SPEC] [TARGETDIR]"
+	echog "Options:"
+	echog " -r PROJECTVERSION - set other project version (PROJECTVERSION/sources)"
+	echog " TARGETDIR - copy signed src.rpm package to TARGETDIR"
 	echog "You can set default target dir in UPLOADDIR variable in config file"
 	exit 0
 fi
@@ -41,7 +44,7 @@ if [ ! -r $SPECNAME ] ; then
 	fatal "Spec $SPECNAME does not found in the current dir"
 fi
 
-#ETERDESTSRPM=/var/ftp/pub/Etersoft/CIFS@Etersoft/$VERSION/sources
+#Example: ETERDESTSRPM=/var/ftp/pub/Etersoft/CIFS@Etersoft/$VERSION/sources
 ETERDESTSRPM=$1
 if [ -z "$ETERDESTSRPM" ] ; then
 	ETERDESTSRPM=$(get_etersoft_srpm_path $SPECNAME "$ALPHA")

bin/rpmqf

@@ -9,7 +9,7 @@
 # TODO not -i only, we need any key
 
 if [ "$1" = "-h" ]; then
-	echo "rpmqf - the same as rpm -qf"
+	echo "rpmqf - the same as rpm -qf, but use which for search command place"
 	exit 0
 fi
 
@@ -45,4 +45,4 @@ real_file()
 
 real_file "$1"
 
-rpm -qf $ARG "$FULLFILEPATH"
+rpmquery -f $ARG "$FULLFILEPATH"

bin/rpmrb

@@ -31,7 +31,9 @@ test -n "$GSSETRELEASE" || GSSETRELEASE=alt1
 export GSSETRELEASE
 
 if [ "$1" = "-h" ]; then
-	echo "rpmrb spec [vermajor][.verminor] [rel] - update spec to vermajor.verminor version, build %rel release"
+	echog "rpmrb - update spec to vermajor.verminor version, build %rel release"
+	echog "Usage: rpmrb spec [vermajor][.verminor] [rel]"
+	echog "Example: rpmrb name.spec 22.6 alt2"
 	exit 0
 fi
 

bin/rpmunmets

@@ -31,7 +31,7 @@ make_testingbox()
 }
 
 
-Usage="Usage: $name [-M24 -M40]"
+Usage="Usage: $name [-M24 -M40] [-s]"
 function mygetopts()
 {
 name=${0##*/}
@@ -43,7 +43,7 @@ phelp()
 	echog "$Usage"
 	echog "Options:"
 	echog " -s   - get all unmets"
-	echog " -M40 - test for distro ALT Linux 4.0"
+	echog " -$CURRENTBRANCHNAME - test for distro ALT Linux $CURRENTBRANCHNAME"
 }
 
 SKIPTST=

bin/rpmurl

@@ -31,9 +31,10 @@ phelp()
 	echog "$Usage"
 	echog "Options:"
 	echog " -c - check URL"
-	echog " -f - print failed URL only"
 	echog " -p - open package page at sisyphus.ru"
 	echog " -s - open source dir in browser"
+	echog "Ext. options:"
+	echog " -f - print failed URL only"
 }
 
 while getopts :hcfsp opt; do