Commit 50771929 authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmgs: improve for tags support

parent e8d8bbab
...@@ -273,6 +273,7 @@ do ...@@ -273,6 +273,7 @@ do
if [ -n "${GETSOURCESVN}" ] ; then if [ -n "${GETSOURCESVN}" ] ; then
# clone svn repo to current dir # clone svn repo to current dir
# FIXME: need to clone in git root dir # FIXME: need to clone in git root dir
# FIXME: remove hack with GITROOT
GITROOT=. GITROOT=.
[ $(basename `pwd`) = ".gear" ] && GITROOT=../ [ $(basename `pwd`) = ".gear" ] && GITROOT=../
docmd git svn clone $GETSOURCESVN $GITROOT docmd git svn clone $GETSOURCESVN $GITROOT
...@@ -285,8 +286,18 @@ do ...@@ -285,8 +286,18 @@ do
docmd git remote add upstream $GETSOURCEGIT docmd git remote add upstream $GETSOURCEGIT
docmd git fetch upstream || fatal docmd git fetch upstream || fatal
#TODO check tag: v%version or %version #TODO check tag: v%version or %version
[ -n "$GSSETVERSION" ] || fatal "Sorry, I don't know new version"
docmd git merge v$GSSETVERSION || docmd git merge $GSSETVERSION docmd git merge v$GSSETVERSION || docmd git merge $GSSETVERSION
#docmd git commit -m "mergejust import $FTB with rpmgs script"
# FIXME: remove hack with GITROOT
GITROOT=.
[ $(basename `pwd`) = ".gear" ] && GITROOT=../
if [ -d "$GITROOT/tags" ] ; then
docmd gear-update-tag -a
fi
#docmd gammit
#docmd git commit -m "merge $FTB with rpmgs script"
elif is_gear ; then elif is_gear ; then
CURNAME=$(get_tardir_from_rules) || fatal "There is no 'tar:' line in gear rules file or 'tar: .' used" CURNAME=$(get_tardir_from_rules) || fatal "There is no 'tar:' line in gear rules file or 'tar: .' used"
# FIXME: hack to unpack to correct place. # FIXME: hack to unpack to correct place.
......
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