clean up helps for all commands

bin/aptU

@@ -8,10 +8,13 @@
 load_mod gettext
 
 if [ "$1" = "-h" ]; then
-	echog "aptU [-v] [-l] - update package and all it requires"
-	echog "Usage: aptU [package(s)]"
-	echog " -v - verbose"
-	echog " -l - print list of required packages"
+	echog "aptU - update package and all it requires"
+	echo
+	echog "Usage: aptU [-v] [-l] [package(s)]"
+	echo
+	echog "Options:"
+	echog "  -v  verbose"
+	echog "  -l  print list of required packages"
 	exit 0
 fi
 

bin/gacl

@@ -13,16 +13,26 @@ mygetopts()
 
 	if [ "$1" = "-h" ] ; then
 		echog "gacl - acl control for gear repo in $GIRARHOST"
-		echog "Use: gacl [GIRAR] [-$CURRENTBRANCHNAME] | [-b REPONAME]  [package] command [params]"
+		echo
+		echog "Usage: gacl [GIRAR] [-b REPONAME] [package] command [params]"
+		echo
 		echog "Options:"
-		echog " -b REPONAME - binary repository name (4.1, 5.0, 5.1 and so on)"
+		echog "    GIRAR        git.alt or git.eter"
+		echog "    -b REPONAME  binary repository name (4.1, p5, 5.1 and so on) (sisyphus by default)"
+		echo
+		echog "Commands:"
+		echog "    add USER  add new user to ACL list for package"
+		echog "    del USER  del user from ACL list for package"
+		echog "    show      show current ACL list"
+		echo
 		echog "Examples:"
-		echog "    gacl [-$CURRENTBRANCHNAME] package add newuser"
-		echog "    gacl [-$CURRENTBRANCHNAME] package del newuser"
-		echog "    gacl [-$CURRENTBRANCHNAME] package show"
-		echog "Examples for current git project:"
-		echog "    gacl [-$CURRENTBRANCHNAME] add newuser"
-		echog "    gacl [-$CURRENTBRANCHNAME] show"
+		echog "    gacl package add newuser"
+		echog "    gacl package del newuser"
+		echog "    gacl -b p6 package show"
+		echo
+		echog "Examples for git project from current dir:"
+		echog "    gacl add newuser"
+		echog "    gacl -b p6 show"
 		exit 0
 	fi
 

bin/gpull

@@ -5,16 +5,19 @@
 load_mod git
 
 if [ "$1" = "-h" ] || [ "$1" = "--help" ] ; then
-	echo "gpull - do git pull --rebase"
-	echo "Use: gpull [-a] [-n] [repo] [branch]"
-	echo "     gpull without parameters or with branch name"
-	echo "     gpull myrepo - for pull from remote myrepo gear repo (with --rebase by default)"
+	echo "gpull - do git pull with fast forward only by default."
+	echo
+	echo "Usage: gpull [-a] [-n] [repo] [branch]"
+	echo
+	echo "gpull without parameters or with branch name"
+	echo "gpull myrepo - for pull from remote myrepo gear repo (with --rebase by default)"
+	echo
 	echo "Options:"
-	echo "     -a - pull all branches"
-	echo "     -r - rebase during pull"
-	echo "     -m - do merge if possible"
-	echo "     -f - pull with fast forward only (default)"
-	echo "     -c - return error status if repo was not uptodate (gpull || echo 'Was updated last time')"
+	echo "   -a  pull all branches"
+	echo "   -r  rebase during pull"
+	echo "   -m  do merge if possible"
+	echo "   -f  pull with fast forward only (default)"
+	echo "   -c  return error status if repo was not uptodate (gpull || echo 'Was updated last time')"
 	exit 1
 fi
 

bin/grpmbs

@@ -7,13 +7,14 @@ load_mod git
 set_girar_host $1 && shift
 
 if [ "$1" = "-h" ] || [ "$1" = "--help" ] ; then
-	echo "grpmbs - multi repo rpmbs analogue (build packages via girar)"
-	echo "Run in dir contains subdirs"
-	echo "Use: grpmbs [GIRAR] [-a|-u] [-f] package1... package2..."
-	echo "Options:"
-	echo "    -a - build all packages in one task"
-	echo "    -u - build packages separately (one package per task)"
-	echo "    -f - force set tags (see rpmbs)"
+	echog "grpmbs - multi repo rpmbs analogue (build packages via girar)"
+	echog "Run in dir contains subdirs"
+	echog "Usage: grpmbs [GIRAR] [-a|-u] [-f] package1... package2..."
+	echo
+	echog "Options:"
+	echog "    -a  build all packages in one task"
+	echog "    -u  build packages separately (one package per task)"
+	echog "    -f  force set tags (see rpmbs)"
 	exit 1
 fi
 

bin/grpmbsh

@@ -8,7 +8,7 @@ set_girar_host $1 && shift
 
 if [ "$1" = "-h" ] || [ "$1" = "--help" ] ; then
 	echo "grpmbsh - multi repo rpmbsh analogue (build packages in hasher)"
-	echo "Use: grpmbs [GIRAR] package1... package2..."
+	echo "Usage: grpmbs [GIRAR] package1... package2..."
 	# FIXME: concatenate grpmbsh and grpmbs
 	#echo "Options:"
 	#echo "    -a - build all packages in one task"
@@ -19,7 +19,7 @@ fi
 
 
 for i in "$@" ; do
-	cd $i || fatal "Run in dir, contains '$i' directory."
-	rpmbsh $GIRARHOST || fatal
+	docmd cd $i || fatal "Please run in dir with '$i' subdirectory."
+	docmd rpmbsh $GIRARHOST || fatal
 	cd -
 done

bin/loginhsh

@@ -28,16 +28,18 @@ phelp()
 {
 	echog "$Descr"
 	echog "$Usage"
+	echo
 	echog "Options:"
-	echog " -i - initialize hasher"
-	echog " -c - cleanup hasher"
-	echog " -o - log in as root user"
-	echog " -v - verbose"
-	echog " -t - use test hasher dir (different to build hasher)"
-	echog " -M?? - branch name"
+	echog "   -i           initialize hasher"
+	echog "   -c           cleanup hasher"
+	echog "   -o           log in as root user"
+	echog "   -v           verbose"
+	echog "   -t           use test hasher dir (different to build hasher)"
+	echog "   -M??         branch name"
+	echo
 	echog "Extra options:"
-	echog " -a - auto test mode for post myhsh build checking"
-	echog " -r - remote login to hasher"
+	echog "   -a           auto test mode for post myhsh build checking"
+	echog "   -r           remote login to hasher"
 }
 
 while getopts :chitoav opt; do

bin/myhsh

@@ -23,10 +23,11 @@ phelp()
 {
 	echog "$Descr"
 	echog "$Usage"
+	echo
 	echog "Options:"
-	echog " -i - install built packages in test hasher"
-	echog " -c - build without stuff (without previous built packages)"
-	echog " -l - lazy cleanup (before build, not after)"
+	echog "   -i  install built packages in test hasher"
+	echog "   -c  build without stuff (without previous built packages)"
+	echog "   -l  lazy cleanup (before build, not after)"
 
 }
 

bin/rpmbb

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

bin/rpmbs

@@ -42,22 +42,24 @@ phelp()
 {
 	echog "$Descr"
 	echog "$Usage"
+	echo
 	echog "Options:"
-	echog " -u - sign and run gear build task after build"
-	echog " -a TASK - sign package(s)/repo, push/upload it and add to (shared) task TASK"
-	echog " -p POCKET - build package in POCKET (supported on git.etersoft.ru only)"
-	echog "Korinf options:"
+	echog "   -u            sign and run gear build task after build"
+	echog "   -a TASK       sign package(s)/repo, push/upload it and add to (shared) task TASK"
+	echog "   -p POCKET     build package in POCKET (supported on git.etersoft.ru only)"
+	echo
+	#echog "Korinf options:"
 	#echog " -k [TARGET] - generate src.rpm and publish to TARGET dir (from Source: by default)"
 	#echog " -r [RELEASE] - publish to RELEASE target dir version"
 	echog "Ext. options:"
-	echog " -b REPONAME - binary repository name (4.1, 5.0, 5.1 and so on)"
-	echog " -c - only sign package(s) with checking"
-	echog " -f - force operation (overwrite tag)"
-	echog " -s - sign package(s) (and move it to dir ETERDESTSRPM if defined)"
-	echog " -t - set tag with sign"
-	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 "   -b REPONAME  binary repository name (4.1, 5.0, 5.1 and so on)"
+	echog "   -c           only sign package(s) with checking"
+	echog "   -f           force operation (overwrite tag)"
+	echog "   -s           sign package(s) (and move it to dir ETERDESTSRPM if defined)"
+	echog "   -t           set tag with sign"
+	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"
 }

bin/rpmbsh

@@ -26,16 +26,18 @@ phelp()
 {
 	echog "$Descr"
 	echog "$Usage"
+	echo
 	echog "Options:"
-	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 "   -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)"
+	echo
 	echog "Ext. options:"
-	echog " -c - build without stuff (previous built packages)"
-	echog " -s - sign (and move to dir ETERDESTSRPM if defined) after build"
-	echog " -t - make temporary commit before build (rpmbb like behavior)"
-	echog " -l - lazy cleanup (clean before build, not after)"
-	echog " -f - force tag set (see rpmbs --help)"
+	echog "   -c  build without stuff (previous built packages)"
+	echog "   -s  sign (and move to dir ETERDESTSRPM if defined) after build"
+	echog "   -t  make temporary commit before build (rpmbb like behavior)"
+	echog "   -l  lazy cleanup (clean before build, not after)"
+	echog "   -f  force tag set (see rpmbs --help)"
 }
 
 while getopts :hrulsimt opt; do

bin/rpmgp

@@ -148,21 +148,23 @@ phelp()
 # TODO: improve description
 	echog "$Descr"
 	echog "$Usage"
-	echog "Options:"
 	echog " pkgname - installed package name or src.rpm"
-	echog " system - name of system (ALT Linux by default if -a missed)"
-	echog " -a  search pkgname in all known repositories"
-	echog " -c  check if this package exists in the ALT Linux repository"
-	echog " -d  download all matched packages"
-	echog " -g  clone last built package repo"
-	echog " -gp  clone last built package repo via public access"
-	echog " -gm remote clone repo to USER/packages and clone it locally"
-	echog " -m  migrate to gear from spec/srpm"
+	echog " system  - name of system (ALT Linux by default if -a missed)"
+	echo
+	echog "Options:"
+	echog "   -a   search pkgname in all known repositories"
+	echog "   -c   check if this package exists in the ALT Linux repository"
+	echog "   -d   download all matched packages"
+	echog "   -g   clone last built package repo"
+	echog "   -gp  clone last built package repo via public access"
+	echog "   -gm  remote clone repo to USER/packages and clone it locally"
+	echog "   -m   migrate to gear from spec/srpm"
+	echo
 	echog "Ext. options:"
-	echog " -b  install packages needed for build (use sudo apt-get) (need spec not package name)"
-	echog " -l  list packages needed for build (in local pkg system notation) (experimental)"
-	echog " -r  refresh package list (download it again)"
-	echog " -s  list all known remote repositories"
+	echog "   -b   install packages needed for build (use sudo apt-get) (need spec not package name)"
+	echog "   -l   list packages needed for build (in local pkg system notation) (experimental)"
+	echog "   -r   refresh package list (download it again)"
+	echog "   -s   list all known remote repositories"
 	exit 0
 }
 

bin/rpmgs

@@ -31,9 +31,10 @@ phelp()
 	echog "$Descr"
 	echog "$Usage"
 	echog "You can run 'rpmgs file.spec new_version' for set new version and download it"
+	echo
 	echog "Options:"
-	echog " -a - get all source (not only Source|Source0)"
-	echog " -f - force download (remove source before download)"
+	echog "   -a  get all source (not only Source|Source0)"
+	echog "   -f  force download (remove source before download)"
 }
 
 while getopts :haf opt; do

bin/rpmlog

@@ -12,12 +12,13 @@ load_mod spec rpm git etersoft
 if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
 	echog "rpmlog - update changelog"
 	echog "Usage: rpmlog [-r|-s|-v] [-l|-t] [SPEC] [TAG]"
+	echo
 	echog "Options:"
-	echog " -v - increment version"
-	echog " -r - increment release"
-	echog " -s - increment subrelease"
-	echog " -l - add changelog from git log (since last release tag or TAG)"
-	echog " -t - test run (without change files and repo)"
+	echog "   -v  increment version"
+	echog "   -r  increment release"
+	echog "   -s  increment subrelease"
+	echog "   -l  add changelog from git log (since last release tag or TAG)"
+	echog "   -t  test run (without change files and repo)"
 	exit 0
 fi
 

bin/rpmpub

@@ -14,12 +14,13 @@ load_mod spec rpm etersoft
 if [ "$1" = "-h" ]; then
 	echog "rpmpub - Etersoft specific script for publish gear repo to target ftp dir as src.rpm"
 	echog "Usage: rpmpub [-f] [-r PROJECTVERSION ] [SPEC] [TARGETDIR]"
+	echo
 	echog "Options:"
-	echog " -f - force set tag"
-	echog " -r PROJECTVERSION - set other project version (PROJECTVERSION/sources)"
-	echog " TARGETDIR - copy signed src.rpm package to TARGETDIR (f.i., /tmp/some_version/sources)"
-	echog "By default used path from Source: spec field. "
-	echog "You can set default target dir in ETERDESTDIR variable."
+	echog "   -f                 force set tag"
+	echog "   -r PROJECTVERSION  set other project version (PROJECTVERSION/sources)"
+	echog "   TARGETDIR          copy signed src.rpm package to TARGETDIR (f.i., /tmp/some_version/sources)"
+	echog "                      By default used path from Source: spec field. "
+	echog "                      Also you can set default target dir in ETERDESTDIR variable."
 	exit 0
 fi