Commit 1dc0add4 authored by Vitaly Lipatov's avatar Vitaly Lipatov

fix SPECDIR using, add full path to our commands

parent 130e9b32
...@@ -96,7 +96,7 @@ fi ...@@ -96,7 +96,7 @@ fi
for i in $LISTNAMES for i in $LISTNAMES
do do
# build src.rpm if old way # build src.rpm if old way
SPECDIR=`dirname $i` set_specdir $i
is_gear $SPECDIR || build_rpms_name "$i" is_gear $SPECDIR || build_rpms_name "$i"
if ! is_alt ; then if ! is_alt ; then
if ! build_buildroot ; then if ! build_buildroot ; then
......
...@@ -107,9 +107,7 @@ check_gear_and_tag() ...@@ -107,9 +107,7 @@ check_gear_and_tag()
local GEARCTAG=gear-create-tag local GEARCTAG=gear-create-tag
# set SPECDIR from LISTNAMES if empty # set SPECDIR from LISTNAMES if empty
if [ -r "$LISTNAMES" ] ; then [ -n "$SPECDIR" ] || set_specdir $LISTNAMES
[ -n "$SPECDIR" ] || SPECDIR=`dirname $LISTNAMES`
fi
if is_gear $SPECDIR ; then if is_gear $SPECDIR ; then
# needed correct user.name/user.email for get GPG id # needed correct user.name/user.email for get GPG id
...@@ -153,9 +151,7 @@ fi ...@@ -153,9 +151,7 @@ fi
#echo "@@ - $LISTRPMARGS - '$MENV'" #echo "@@ - $LISTRPMARGS - '$MENV'"
# set SPECDIR from LISTNAMES if empty # set SPECDIR from LISTNAMES if empty
if [ -r "$LISTNAMES" ] ; then [ -n "$SPECDIR" ] || set_specdir $LISTNAMES
[ -n "$SPECDIR" ] || SPECDIR=`dirname $LISTNAMES`
fi
# If we build from gear repo, run task # If we build from gear repo, run task
if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
......
...@@ -123,7 +123,7 @@ do ...@@ -123,7 +123,7 @@ do
subst "s|Source0:|Source:|" $i subst "s|Source0:|Source:|" $i
subst "s|Patch0:|Patch:|" $i subst "s|Patch0:|Patch:|" $i
SPECDIR=`dirname $i` set_specdir $i
if ! is_gear $SPECDIR && [ -n "$RENAME_SOURCE_TARBALL" ] ; then if ! is_gear $SPECDIR && [ -n "$RENAME_SOURCE_TARBALL" ] ; then
# Use tar.bz2 for tarball if not git case. # Use tar.bz2 for tarball if not git case.
subst "s|\(Source:.*\).tar.gz|\1.tar.bz2|" $i subst "s|\(Source:.*\).tar.gz|\1.tar.bz2|" $i
......
...@@ -32,7 +32,7 @@ fi ...@@ -32,7 +32,7 @@ fi
test -e "$SPEC" || fatal "use with spec" test -e "$SPEC" || fatal "use with spec"
rpmgs $SPEC $VER || fatal "Error with get source" $ETERBUILDBIN/rpmgs $SPEC $VER || fatal "Error with get source"
add_changelog_helper "- new version $(get_version $SPEC) (with rpmrb script)" $SPEC || echog "Changelog entry already exists" add_changelog_helper "- new version $(get_version $SPEC) (with rpmrb script)" $SPEC || echog "Changelog entry already exists"
# TODO # TODO
...@@ -41,5 +41,5 @@ if is_gear `pwd` ; then ...@@ -41,5 +41,5 @@ if is_gear `pwd` ; then
git commit $SPEC -m "update spec to new build" || exit 1 git commit $SPEC -m "update spec to new build" || exit 1
fi fi
rpmbsh $REMOTE -i $SPEC || fatal "Error with build in hasher" $ETERBUILDBIN/rpmbsh $REMOTE -i $SPEC || fatal "Error with build in hasher"
rpmbs -u $SPEC || fatal "Error with upload" $ETERBUILDBIN/rpmbs -u $SPEC || fatal "Error with upload"
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