Commit ac1b00f2 authored by Vitaly Lipatov's avatar Vitaly Lipatov

small code cleanup

parent c0dce4e8
......@@ -124,8 +124,7 @@ rpmbs_copying_built()
{
if [ -n "$ETERDESTSRPM" ] ; then
echog "Copying package(s) in \$ETERDESTSRPM"
if echo "$ETERDESTSRPM" | grep -q ":" ; then
# if ssh target
if is_ssh_target "$ETERDESTSRPM" ; then
scp $LISTBUILT $ETERDESTSRPM || echog "Error during copying"
else
mkdir -p $ETERDESTSRPM || echog "Error mkdir $ETERDESTSRPM"
......
......@@ -176,3 +176,8 @@ make_temp_file()
fi
}
is_ssh_target()
{
echo "$1" | grep -q ":"
}
......@@ -9,10 +9,12 @@ get_etersoft_srpm_path()
local SOURCE
local ALPHA=$2
local SOURCEFTP=$(eval_spec $1 | get_var "Source")
if [ -z "$SOURCEFTP" ] ; then
build_rpms_name $1
SOURCEFTP=$(cat $1 | get_var "#Source" | subst_namever)
fi
[ -n "$SOURCEFTP" ] || fatal "Can't get Source from spec"
SOURCEFTP=$(dirname "$SOURCEFTP")
......@@ -26,13 +28,13 @@ get_etersoft_srpm_path()
echo $SOURCEFTP | grep -q "tarball\$" && SOURCEFTP=$(dirname "$SOURCEFTP")
# translate ftp to local path
SOURCE=$(echo "$SOURCEFTP" | sed -e "s|.*://.*$COMPANYFTP|$TARGETFTPBASE|g")
[ -d "$SOURCE" ] || fatal "Can't locate $SOURCE dir, translated from $SOURCEFTP"
# rewrite V.E.R./sources with $ALPHA/sources
if [ -n "$ALPHA" ] ; then
SOURCE=$(dirname $SOURCE)
SOURCE=$(dirname $SOURCE)/$ALPHA/sources
fi
mkdir -p $SOURCE || fatal "Can't create $SOURCE"
echo $SOURCE
}
......
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