remove obsoleted and unused code and vars

bin/rpmbs

@@ -214,17 +214,7 @@ if  [ -n "$REMOTEBUILD" ] ; then
 fi
 
 if [ -n "${DELETENOW}" ]; then
-	echog "Removing did not realized yet"
-	exit 1
-	echog "Removing from '$RSYNCINCOMING/$INCOMING/'"
-	check_key
-	for i in $LISTBUILT ; do
-		> $i
-	done
-	rsync -vay --partial --progress --delete \
-	 	-e ssh $LISTBUILT $RSYNCINCOMING/$INCOMING/
-	echo "$i REMOVED from Incoming/$INCOMING ($MENV) at `date "+%c"`" >>$RPMDIR/uploaded.log
-	exit 0
+	fatal "Removing did not realized yet"
 fi
 
 # if just packing

bin/rpmbsh

@@ -87,7 +87,7 @@ if  [ -n "$REMOTEBUILD" ] ; then
 	check_key
 	test -n "$BUILDSERVER" || fatal "Please set BUILDSERVER in config file"
 	# FIXME - get via etersoft-build-utils
-	test -n "$REMOTERPMDIR" || REMOTERPMDIR=`ssh $BUILDSERVER echo $HOME`/RPM
+	REMOTERPMDIR=`ssh $BUILDSERVER echo $HOME`/RPM
 	LISTSRPM="$(echo $LISTBUILT | xargs -n1 basename)"
 	echo
 	echog "############ Build at build server '$BUILDSERVER' (with $LISTRPMARGS options) ############"

etc/config

@@ -38,9 +38,6 @@
 # Path to apt config
 #APTCONFBASE=/etc/eterbuild/apt/apt.conf
 
-# FIXME: для чего это?
-#REMOTERPMDIR="~/RPM"
-
 # Адрес ftp-сервера компании
 #COMPANYFTP=etersoft.ru
 
@@ -50,9 +47,6 @@
 # Каталог для записи протоколов сборки
 #LOGDIR=$RPMDIR/log
 
-# Базовый SSH-путь для отправки пакетов
-#RSYNCINCOMING=incoming:/incoming
-
 # Ключ, используемый при отправке
 #SSH_KEYFILE=~/.ssh/id_dsa
 

share/eterbuild/functions/config

@@ -7,6 +7,7 @@ ETERBUILDVERSION=178
 
 # Определяем SUDO для использования
 SUDO="sudo"
+
 # for some shells? not for bash
 test -z "$UID" && UID=`id -u`
 if [ $UID = "0" ]; then
@@ -17,9 +18,10 @@ fi
 OURTMPDIR=$TMPDIR
 [ -z "$OURTMPDIR" ] || [ -d "$OURTMPDIR" ] || OURTMPDIR=/tmp
 
-# It can be overrides in config
+# detect our arch
 [ -n "$DEFAULTARCH" ] || DEFAULTARCH=i586
 [ `uname -m` = "x86_64" ] && DEFAULTARCH=`uname -m`
+
 NICE="nice"
 RPMBUILD=rpmbuild
 
@@ -35,39 +37,39 @@ OWNERMAIL=`rpm --eval %packager`
 COMPANYFTP=etersoft.ru
 TARGETFTPBASE="/var/ftp"
 LOGDIR="$RPMDIR/log"
-REMOTERPMDIR=
 HASHERDIR="$HOME/hasher"
 HASHER_NOCHECK=nvr,gpg,packager,buildtime
 HASHERARG=""
+
 # for use in help as example branch/distro name
 CURRENTBRANCHNAME="M51"
+
 [ -n "$DEBUG" ] && HASHERARG="-v $HASHERARG"
 
-RSYNCSISYPHUS=rsync.altlinux.org::ALTLinux/Sisyphus
-# obsoleted
-RSYNCINCOMING=devel:/incoming
 #SSH_KEYFILE=~/.ssh/id_dsa
 GIRARHOST=git.alt
 
 BUILDSERVER=
 #BUILDSERVERPATH="$HASHERDIR/repo/i586/RPMS.hasher"
 
-PKGREPLBASE=$ETERBUILDDIR/pkgrepl
-
 # TODO: use common ccache dir
 export CCACHE_DIR=$OURTMPDIR/ccache
 
 # enable ccache using
 # CCACHE_ENABLE=yes
 
+# load system wide config
 test -f /etc/eterbuild/config && . /etc/eterbuild/config
 
+# load user config files
 if [ -f ~/.config/eterbuild ] ; then
 	. ~/.config/eterbuild
 elif [ -f ~/.eterbuild-config ] ; then
 	. ~/.eterbuild-config
 else
-	# obsoleted, load if eterbuild-config is missed
-	test -f ~/.ebconfig  && . ~/.ebconfig
+	if [ -f ~/.ebconfig ] ; then
+		. ~/.ebconfig
+		warning "./ebconfig is obsoleted, use ~/.config/eterbuild instead"
+	fi
 fi
 

share/eterbuild/functions/repl

@@ -3,6 +3,8 @@
 # Author: Vitaly Lipatov <lav@etersoft.ru>
 # Public domain
 
+PKGREPLBASE=$ETERBUILDDIR/pkgrepl
+
 # Get replacement rule for ALT package to local in $1 (scan for files in $@)
 # set ALTPKGNAME, TARGETPKGNAME variable
 tolocal_anyrepl()