small fixes

Makefile

@@ -19,8 +19,6 @@ install:
 	mkdir -p $(DESTDIR)$(pkgdatadir)/functions/
 	mkdir -p $(DESTDIR)$(pkgdatadir)/pkgrepl $(DESTDIR)$(pkgdatadir)/grprepl/
 	install -m 755 bin/* $(DESTDIR)$(bindir)
-	# do not pack anymore
-	rm -f  $(DESTDIR)$(bindir)/mkpatch
 	install -m 644 etc/apt/* $(DESTDIR)$(sysconfdir)/eterbuild/apt/
 	install -m 644 etc/config $(DESTDIR)$(sysconfdir)/eterbuild/
 	install -m 644 etc/repos/* $(DESTDIR)$(sysconfdir)/eterbuild/repos/

bin/loginhsh

 #!/bin/sh
-# 2005-2006, 2012, 2016, 2018 (c) Etersoft www.etersoft.ru
+# 2005-2006, 2012, 2016, 2018, 2020 (c) Etersoft www.etersoft.ru
 # Author: Vitaly Lipatov <lav@etersoft.ru>
 # Public domain
 #
@@ -41,7 +41,7 @@ phelp()
 	echo
 	echog "Extra options:"
 	echog "   -d           print hasher dir only"
-	echog "   -s           do not install stuffs (extra packages)"
+	echog "   -s           skip install stuffs (extra packages)"
 	echog "   -n           disable network"
 }
 

bin/myhsh

 #!/bin/bash
-# 2003-2006, 2008-2010, 2013, 2016 (c) Etersoft www.etersoft.ru
+# 2003-2006, 2008-2010, 2013, 2016, 2020 (c) Etersoft www.etersoft.ru
 # Author: Vitaly Lipatov <lav@etersoft.ru>
 # Public domain
 #
@@ -12,7 +12,7 @@ load_mod hasher check
 WITHSTUFF="--with-stuff"
 
 #############################
-Usage="Usage: $name [-l -r -c -l -p] src.rpm..."
+Usage="Usage: $name [-b -l -r -c -l -p] src.rpm..."
 function mygetopts()
 {
 name=${0##*/}
@@ -31,7 +31,7 @@ phelp()
 	echog "   -b REPONAME  binary repository name (p6, t6, c7, p8 and so on)"
 }
 
-while getopts :hbclr opt; do
+while getopts :hbpclr opt; do
     case $opt in
     h) phelp; exit 0;;
     p) PRINTBINPKG=1;;

bin/rpmbph

@@ -29,7 +29,7 @@ phelp()
 	echo
 	echog "Options:"
 	echog "   -u           sign and upload after build" # will pass to rpmbs/rpmbsh
-	echog "   -n           do not build in hasher"
+	echog "   -n           skip build in hasher"
 	echog "   -i           install built packages in test hasher" # will pass to rpmbs/rpmbsh
 	echog "   -b REPONAME  binary repository name (4.1, p5, t6 and so on)"
 	echo  "$HELP_GIRAR"

bin/rpmbs

 #!/bin/bash
-# (c) Etersoft 2003-2012, 2017, 2018
-# Author: Vitaly Lipatov <lav@etersoft.ru>, 2012, 2017, 2018
+# (c) Etersoft 2003-2012, 2017, 2018, 2020
+# Author: Vitaly Lipatov <lav@etersoft.ru>, 2012, 2017, 2018, 2020
 # Public domain
 #
 # BS - build source

bin/rpmbsh

 #!/bin/sh
-# 2003-2017 (c) Etersoft www.etersoft.ru
+# 2003-2020 (c) Etersoft www.etersoft.ru
 # Author: Vitaly Lipatov <lav@etersoft.ru>
 # Public domain
 #

bin/rpmgs

 #!/bin/bash
-# 2005-2006, 2009, 2014, 2015, 2016, 2017 (c) Etersoft www.etersoft.ru
+# 2005-2006, 2009, 2014, 2015, 2016, 2017, 2020 (c) Etersoft www.etersoft.ru
 # 2005-2016 Author: Vitaly Lipatov <lav@etersoft.ru>
 # Public domain
 #

bin/rpmlog

@@ -205,7 +205,7 @@ if [ -n "$TESTRUN" ] ; then
 	exit
 fi
 
-add_changelog_helper "$CHANGELOG" $SPECNAME || fatal "add_changelog failed, do not commit anything"
+add_changelog_helper "$CHANGELOG" $SPECNAME || fatal "add_changelog failed, leave all uncommitted"
 
 #git_commit_ignore_nothing $SPECNAME -m "new build $NEWREV (with rpmlog script)"
 gammit $QUIET --spec=$SPECNAME $SPECNAME

bin/runinhsh

 #!/bin/sh
-# 2016 (c) Etersoft www.etersoft.ru
+# 2016, 2020 (c) Etersoft www.etersoft.ru
 # Author: Vitaly Lipatov <lav@etersoft.ru>
 # Public domain