introduce HASHERBASEDIR and set_hasherdir and use it

bin/loginhsh

@@ -39,8 +39,8 @@ phelp()
 
 while getopts :chito opt; do
     case $opt in
-    h) phelp; exit 0;;
-    t) HASHERDIR=$HASHERDIR-test; TESTMODE=1 ;;
+	h) phelp; exit 0;;
+	t) TESTMODE=1 ;;
 	i) INITIALIZE=1 ;;
 	c) CLEANUP=1 ;;
 	r) REMOTE=1 ;;
@@ -61,7 +61,8 @@ LISTRPMARGS=$@
 
 parse_cmd_pre "$@" --
 
-HASHERDIR=$HASHERDIR$MENVARG
+set_hasherdir
+[ -n "$TESTMODE" ] && HASHERDIR=$HASHERDIR-test
 
 HSH=/usr/bin/hsh
 if [ ! -x "$HSH" ] ; then

bin/myhsh

@@ -54,10 +54,7 @@ mygetopts $LISTARGS
 
 RESULT=0
 
-HASHERDIR=$HASHERDIR$MENVARG
-if [ "$DEFAULTARCH"="x86_64" ] ; then
-	HASHERDIR="$HASHERDIR-64"
-fi
+set_hasherdir
 
 mkdir -p $LOGDIR $HASHERDIR || fatal "cannot mkdir"
 check_locking

bin/rpmunmets

@@ -75,7 +75,8 @@ TESTINGWORKDIR=$OURTMPDIR/WD2
 
 ORDINALAPTCONF=$APTCONF
 
-HASHERDIR=$HASHERDIR$MENVARG
+set_hasherdir
+
 if [ ! -d $HASHERDIR/repo ] || [ -n "$SKIPTST" ] ; then
 	[ -z "$SKIPTST" ] && fatal "Can't find repo in hasher '$HASHERDIR' dir, use -s for overall check"
 	make_ordinalbox

etc/config

@@ -8,7 +8,7 @@
 # and uncomment any setting line
 
 # Путь к каталогу сборки hasher:
-#HASHERDIR=~/hasher
+#HASHERBASEDIR=~/hasher
 # Additional arguments for hasher
 #HASHER_ARG=""
 

share/eterbuild/functions/config

@@ -39,7 +39,7 @@ OWNERMAIL=`rpm --eval %packager`
 COMPANYFTP=etersoft.ru
 TARGETFTPBASE="/var/ftp"
 LOGDIR="$RPMDIR/log"
-HASHERDIR="$HOME/hasher"
+HASHERBASEDIR="$HOME/hasher"
 HASHER_NOCHECK=nvr,gpg,packager,buildtime
 HASHERARG=""
 
@@ -52,7 +52,6 @@ CURRENTBRANCHNAME="M51"
 GIRARHOST=git.alt
 
 BUILDSERVER=
-#BUILDSERVERPATH="$HASHERDIR/repo/i586/RPMS.hasher"
 
 # TODO: use common ccache dir
 export CCACHE_DIR=$OURTMPDIR/ccache

share/eterbuild/functions/hasher

@@ -5,6 +5,18 @@
 
 load_mod rpm
 
+set_hasherdir()
+{
+	if [ -z "$HASHERBASEDIR" ] ; then
+		warning "HASHERBASEDIR is not set. I will try with HASHERDIR, but you have to set HASHERBASEDIR in the config file"
+		HASHERBASEDIR=$HASHERDIR
+	fi
+	HASHERDIR=$HASHERBASEDIR$MENVARG
+	if [ "$DEFAULTARCH"="x86_64" ] ; then
+		HASHERDIR="$HASHERDIR-64"
+	fi
+}
+
 check_locking()
 {
 	test -f "$HASHERDIR/pid" || return

tests/test_get_bin.sh

 #!/bin/sh
 
 . `dirname $0`/../share/eterbuild/functions/common
-. $ETERBUILDDIR/functions/rpm
+load_mod rpm hasher
 
-HASHERDIR=$HASHERDIR-SS
+MENV=SS
+set_hasherdir
 
 for i in `ls -1 $HASHERDIR/repo/SRPMS.hasher` ; do
 	echo "get for $i:"