Skip to content

E
etersoft-build-utils
Commit d5fc3bb2 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

rpmgs: fix search main source dir

parent 8f9656fb
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
bin/rpmgs
View file @ d5fc3bb2
...@@ -291,6 +291,9 @@ commit_tarball() ...@@ -291,6 +291,9 @@ commit_tarball()
#test -d "$CURNAME" || CURNAME=$(get_root_git_dir)/$(get_tarballname "$spec") #test -d "$CURNAME" || CURNAME=$(get_root_git_dir)/$(get_tarballname "$spec")
#test -d "$CURNAME" || CURNAME=$(get_root_git_dir)/$BASENAME #test -d "$CURNAME" || CURNAME=$(get_root_git_dir)/$BASENAME
# save first committed source dir
[ -z "$FIRSTSOURCEDIR" ] && FIRSTSOURCEDIR="$(basename "$CURNAME")"
commit_tarball_to_dir "$TARBALL" "$EXTTARBALL" "$CURNAME" commit_tarball_to_dir "$TARBALL" "$EXTTARBALL" "$CURNAME"
} }
...@@ -399,8 +402,9 @@ update_predownloaded() ...@@ -399,8 +402,9 @@ update_predownloaded()
local RGD=$(get_root_git_dir) local RGD=$(get_root_git_dir)
CURNAME=$FIRSTSOURCEDIR
# hack for subdir?? # hack for subdir??
CURNAME=$BASENAME #CURNAME=$BASENAME
# TODO: add support for git # TODO: add support for git
rm -rf $PSM rm -rf $PSM
...@@ -643,6 +647,7 @@ fi ...@@ -643,6 +647,7 @@ fi
SOURCELIST=$(grep "^Source0\?:" $spec | sed -e "s|:.*||g") SOURCELIST=$(grep "^Source0\?:" $spec | sed -e "s|:.*||g")
fi fi
FIRSTSOURCEDIR=''
if [ -z "$DOWNLOADSOME" ] ; then if [ -z "$DOWNLOADSOME" ] ; then
for SN in $SOURCELIST for SN in $SOURCELIST
do do
......
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