rpmgs: fix vendoring for non tarball build

bin/rpmgs

@@ -472,14 +472,14 @@ update_predownloaded()
 
 	local RGD=$(get_root_git_dir)
 
-	CURNAME=$FIRSTSOURCEDIR
+	CURNAME="$FIRSTSOURCEDIR"
 	# hack for subdir??
 	#CURNAME=$BASENAME
 
 	info "Preparing sources in $PSM for mode $MODE ..."
 	# TODO: add support for git
 	rm -rf $PSM
-	if [ -n "$GETSOURCEGIT" ] ; then
+	if [ -n "$FIRSTSOURCEGIT" ] || [ -n "$GETSOURCEUUPDATE" ] ; then
 		# cp -a exclude .dir
 		mkdir -p $PSM || fatal
 		cp -a $RGD/* $PSM || fatal
@@ -740,6 +740,7 @@ if is_gear $SPECDIR && [ -z "$GSSETVERSION" ] && $EPMCMD assure gear-rules-verif
         $EPMCMD assure gear-uupdate
         if ls $(get_root_git_dir)/.gear | grep \.watch$ || ls $(get_root_git_dir) | grep \.watch$ ; then
             docmd rpm-uscan -v --force-action gear-uupdate
+            GETSOURCEUUPDATE=1
 
             source_postupdate_hook
 
@@ -759,6 +760,7 @@ if is_gear $SPECDIR && [ -z "$GSSETVERSION" ] && $EPMCMD assure gear-rules-verif
         docmd gear-remotes-restore
         docmd gear-remotes-uscan
         docmd gear-commit
+        GETSOURCEUUPDATE=1
 
         # update_post_git_submodules
         source_postupdate_hook
@@ -789,6 +791,7 @@ fi
 		[ -n "$GSSETVERSION" ] || fatal "GSSETVERSION is empty here"
 		tag="$(get_tag_by_version "$GSSETVERSION")"
 		[ -n "$tag" ] || fatal "Can't find appropriate tag for $GSSETVERSION version"
+		GETSOURCEUUPDATE=1
 		docmd gear-uupdate --upstream-version "$GSSETVERSION" --tag $tag
 		docmd gear-commit
 
@@ -892,6 +895,7 @@ fi
 			docmd git remote add upstream $GETSOURCEGIT
 			docmd git fetch --tags upstream
 			update_master_branch_to "$GSSETVERSION"
+			FIRSTSOURCEGIT=1
 
 			update_post_git_submodules
 			source_postupdate_hook