Commit 4f8dad7b authored by Vitaly Lipatov's avatar Vitaly Lipatov

update helps

parent df27b3bc
...@@ -35,13 +35,13 @@ phelp() ...@@ -35,13 +35,13 @@ phelp()
echog " -r run command" echog " -r run command"
echog " -o log in as root user" echog " -o log in as root user"
echog " -v verbose" echog " -v verbose"
echog " -x allow run X program (set DISPLAY and use xauth)" echog " -x allow run X program (set DISPLAY and install xauth)"
echog " -t use test hasher dir (different to build hasher)" echog " -t use test hasher dir (different to usual build dir)"
echo echo
echog "Extra options:" echog "Extra options:"
echog " -a auto test mode for post myhsh build checking" echog " -a auto test mode for post myhsh build checking"
echog " -d print hasher dir" echog " -d print hasher dir"
echog " -M?? branch name" echog " -M?? binary repository name (obsoleted)"
} }
while getopts :chitoadvqr:b:x opt; do while getopts :chitoadvqr:b:x opt; do
......
...@@ -22,11 +22,11 @@ fi ...@@ -22,11 +22,11 @@ fi
############################# #############################
Usage="Usage: $name [-c -p -i -r -R] spec..." Usage="Usage: $name [-c -p -i -r -R] [spec]"
function mygetopts() function mygetopts()
{ {
name=${0##*/} name=${0##*/}
Descr="$name - build binary rpm from spec" Descr="$name - build binary rpm from spec or from git"
phelp() phelp()
{ {
...@@ -34,13 +34,17 @@ phelp() ...@@ -34,13 +34,17 @@ phelp()
echog "$Usage" echog "$Usage"
echo echo
echog "Options:" echog "Options:"
echog " -i skip build, but do install and package" if is_alt ; then
echog " -r find build requires" echog " -i skip build stage, but do install files and package it"
echog " -R find build requires with -bi" echog " -p only packaging installed files into package"
fi
echog " -r find build requires (run buildrequires)"
echog " -R find build requires during install (run buildrequires with -bi)"
echo echo
echog "Ext. options:" echog "Ext. options:"
if is_alt ; then
echog " -c start from compile stage" echog " -c start from compile stage"
echog " -p packaging installed files into package" fi
echog " -d build with dmake" echog " -d build with dmake"
} }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# #
# BPH - backport; use hasher # BPH - backport; use hasher
# Used ROOTDIR if defined # Used ROOTDIR if defined (for non ALT systems)
# Makes backport package to any target platfrom (RPM, DEB, TGZ) # Makes backport package to any target platfrom (RPM, DEB, TGZ)
# Релиз строится на основе релиза из Сизифа. Если там был alt4, то здесь будет alt0.M24.4 # Релиз строится на основе релиза из Сизифа. Если там был alt4, то здесь будет alt0.M24.4
# TODO: use RPMBUILDARG # TODO: use RPMBUILDARG
...@@ -315,7 +315,7 @@ phelp() ...@@ -315,7 +315,7 @@ phelp()
{ {
echog "$Descr" echog "$Descr"
echog "$Usage" echog "$Usage"
echo "Usage: rpmbph -b $EXAMPLEALTDISTRVERSION for backport to ALT Linux $EXAMPLEALTDISTRVERSION and so on" echo "Usage: rpmbph [GIRAR] -b $EXAMPLEALTDISTRVERSION for backport to ALT Linux $EXAMPLEALTDISTRVERSION and so on"
echo echo
echog "Options:" echog "Options:"
echog " -u sign and upload after build" # will pass to rpmbs/rpmbsh echog " -u sign and upload after build" # will pass to rpmbs/rpmbsh
...@@ -324,10 +324,13 @@ phelp() ...@@ -324,10 +324,13 @@ phelp()
echog " -b REPONAME binary repository name (4.1, p5, t6 and so on)" echog " -b REPONAME binary repository name (4.1, p5, t6 and so on)"
echo echo
echog "Ext. options:" echog "Ext. options:"
echog " -r remote build" # will pass to rpmbs/rpmbsh # echog " -r remote build" # will pass to rpmbs/rpmbsh
echog " -v more verbose" echog " -v more verbose"
echog " -q quiet" echog " -q quiet"
echog "Set ROOTDIR variable for backport to the other system" echo
echog "Examples:"
echog " $ rpmbph -b p6 -n -u - backport to p6 and ask to build it"
# echog "Set ROOTDIR variable for backport to the other system"
# echog " -m - send result via e-mail" # echog " -m - send result via e-mail"
} }
......
...@@ -47,19 +47,19 @@ phelp() ...@@ -47,19 +47,19 @@ phelp()
echog " -u sign and run gear build task after build" 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 " -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 " -p POCKET build package in POCKET (supported on git.etersoft.ru only)"
echog " -b REPONAME binary repository name (4.1, p5, t6 and so on)"
echo echo
#echog "Korinf options:" #echog "Korinf options:"
#echog " -k [TARGET] - generate src.rpm and publish to TARGET dir (from Source: by default)" #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 " -r [RELEASE] - publish to RELEASE target dir version"
echog "Ext. options:" echog "Ext. options:"
echog " -b REPONAME binary repository name (4.1, p5, t6 and so on)"
echog " -c only sign package(s) with checking" echog " -c only sign package(s) with checking"
echog " -f force operation (overwrite tag)" echog " -f force operation (overwrite tag)"
echog " -s sign package(s) (and move it to dir ETERDESTSRPM if defined)" echog " -s sign package(s) (and move it to dir ETERDESTSRPM if defined)"
echog " -t set tag with sign" echog " -t set tag with sign"
echog " -n do not check with sisyphus_check before upload" echog " -n do not check with sisyphus_check before upload"
echog " -o create nosrc.rpm package" echog " -o create nosrc.rpm package"
echog " -z create src.rpm with compatible gzip compression" echog " -z create src.rpm with compatible gzip compression (obsoleted)"
# echog " -U - sign package(s) and upload it to Incoming (updates)" # echog " -U - sign package(s) and upload it to Incoming (updates)"
# echog " -d - remove package(s) from SRPMS and Incoming" # echog " -d - remove package(s) from SRPMS and Incoming"
} }
......
...@@ -28,16 +28,16 @@ phelp() ...@@ -28,16 +28,16 @@ phelp()
echog "$Usage" echog "$Usage"
echo echo
echog "Options:" echog "Options:"
echog " -r remote build (on $BUILDSERVER host)"
echog " -u sign and run gear build task after build" echog " -u sign and run gear build task after build"
echog " -i install built packages in test hasher (via loginhsh -t)" echog " -i install built packages in test hasher (via loginhsh -t)"
echog " -f force tag set (see rpmbs --help)"
echo echo
echog "Ext. options:" echog "Ext. options:"
echog " -c build without stuff (previous built packages)" echog " -c build without stuff (without previous built packages)"
echog " -s sign (and move to dir ETERDESTSRPM if defined) after build" echog " -s sign (and move to dir ETERDESTSRPM if defined) after build"
echog " -t make temporary commit before build (rpmbb like behavior)" echog " -t make temporary commit before build (rpmbb like behavior)"
echog " -l lazy cleanup (clean before build, not after)" echog " -l lazy cleanup (clean before build, not after)"
echog " -f force tag set (see rpmbs --help)" # echog " -r remote build (on $BUILDSERVER host)"
} }
while getopts :hrulsimt opt; do while getopts :hrulsimt opt; do
......
...@@ -18,7 +18,12 @@ if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then ...@@ -18,7 +18,12 @@ if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
echog " -r increment release" echog " -r increment release"
echog " -s increment subrelease" echog " -s increment subrelease"
echog " -l add changelog from git log (since last release tag or TAG)" echog " -l add changelog from git log (since last release tag or TAG)"
echo
echog "Ext. options:"
echog " -t test run (without change files and repo)" echog " -t test run (without change files and repo)"
echo
echog "Example:"
echog " $ rpmlog -v -l - typical build new version"
exit 0 exit 0
fi fi
......
...@@ -4,8 +4,6 @@ ...@@ -4,8 +4,6 @@
# Public domain # Public domain
# #
# Open package Url in BROWSER # Open package Url in BROWSER
# Параметры:
# - название спек-файла
# #
# load common functions, compatible with local and installed script # load common functions, compatible with local and installed script
...@@ -20,18 +18,19 @@ Usage="Usage: $name [-c -f -p -s] spec or package..." ...@@ -20,18 +18,19 @@ Usage="Usage: $name [-c -f -p -s] spec or package..."
function mygetopts() function mygetopts()
{ {
name=${0##*/} name=${0##*/}
Descr="$name - open package Url in browser" Descr="$name - open package Url in the default browser"
phelp() phelp()
{ {
echog "$Descr" echog "$Descr"
echog "$Usage" echog "$Usage"
echog "Options:" echog "Options:"
echog " -c - check URL" echog " -c check if package URL is accessible"
echog " -p - open package page at sisyphus.ru" echog " -p open package page on http://sisyphus.ru"
echog " -s - open source dir in browser" echog " -s open source dir in the default browser"
echo
echog "Ext. options:" echog "Ext. options:"
echog " -f - print failed URL only" echog " -f print failed URL only"
} }
while getopts :hcfsp opt; do while getopts :hcfsp opt; do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment