cleanup code

bin/rpmgs

@@ -349,7 +349,7 @@ do
 		GETSOURCE=$(eval_spec $spec | get_var "$SN")
 		[ -n "$GETSOURCE" ] || fatal "Problem with empty $SN"
 
-		echo "Updating $SN:$GETSOURCE ..."
+		echo "Updating $SN: $GETSOURCE ..."
 
 		# for get RPMSOURCEDIR and BASENAME/VERSION/RELEASE
 		build_rpms_name $spec

share/eterbuild/functions/gear

@@ -38,6 +38,7 @@ get_gear_rules_by_spec()
 print_gear_rules()
 {
 	is_gear || fatal "Can't get rules"
+	# hack with @var@ replacement
 	cat $(get_gear_rules) | grep -v "^#" | sed -e "s|@name@|$BASENAME|g" | sed -e "s|@version@|$VERSION|g" | sed -e "s|@release@|$RELEASE|g"
 }
 
@@ -45,6 +46,7 @@ print_gear_rules()
 # uses: version
 get_tardir_from_rules()
 {
+	# TODO: use get_gear_rules only once
 	local tar="$1"
 	local packname="$(basename "$2" .$tar)"
 	local dir

share/eterbuild/functions/spec

@@ -141,13 +141,13 @@ get_version()
 	eval_spec $1 | get_var "Version"
 }
 
-# Args: specname, sourceN
+# Args: specname, source_number
 get_tarballname()
 {
-	local SOURCE=$(eval_spec $1 | get_var "Source$2")
-	[ -n "$SOURCE" ] || SOURCE=$(eval_spec $1 | get_var "Source0")
+	local SOURCE=$(eval_spec "$1" | get_var "Source$2")
+	[ -n "$SOURCE" ] || SOURCE=$(eval_spec "$1" | get_var "Source0")
 	[ -n "$SOURCE" ] || fatal "Can't grep Source$2 from spec $1"
-	basename $(basename $SOURCE | sed -e "s|-$(get_version $1).*||g") .tar
+	basename $(basename "$SOURCE" | sed -e "s|-$(get_version "$1").*||g") .tar
 }