fix docmd and use it instead duplicate showcmd

bin/dmake

@@ -91,5 +91,4 @@ if [ -n "$PLAIN_DISTCC" ] ; then
 #    unset DISTCC_HOSTS
 fi
 
-showcmd $NICE time -p $PUMP make -j$DISTCC_THREADS CC="$DISTCC" CXX="$DISTCXX" $@
-$NICE time -p $PUMP make -j$DISTCC_THREADS CC="$DISTCC" CXX="$DISTCXX" $@
+docmd $NICE time -p $PUMP make -j$DISTCC_THREADS CC="$DISTCC" CXX="$DISTCXX" "$@"

bin/rpmbph

@@ -38,8 +38,7 @@ if [ "$PKGVENDOR" = "alt" ] ; then
 	BUILDREQ=
 	# Change release according to alt policy with extensions
 	# General rule: alwars alt(N-1).MM.(N)
-	showcmd set_release $SPECNAME $(get_txtrelease $SPECNAME)$(decrement_release $BASERELEASE).$MDISTR.$BASERELEASE
-	set_release $SPECNAME $(get_txtrelease $SPECNAME)$(decrement_release $BASERELEASE).$MDISTR.$BASERELEASE
+	docmd set_release $SPECNAME $(get_txtrelease $SPECNAME)$(decrement_release $BASERELEASE).$MDISTR.$BASERELEASE
 	ADDDEF=""
 	CLEANTEXT=""
 	# due new libtool, affected on ALT Linux
@@ -56,8 +55,7 @@ else
 	TXTRELEASE=$(get_txtrelease $SPECNAME)
 	# HACK: Override release with KORINFTARGETRELEASE if set
 	[ -z "$KORINFTARGETRELEASE" ] || TXTRELEASE=$KORINFTARGETRELEASE
-	showcmd set_release $SPECNAME $TXTRELEASE$BASERELEASE$PKGVENDOR
-	set_release $SPECNAME $TXTRELEASE$BASERELEASE$PKGVENDOR
+	docmd set_release $SPECNAME $TXTRELEASE$BASERELEASE$PKGVENDOR
 	test -z "$VERBOSE" || echo "Build package with release $TXTRELEASE"
 	ADDDEF="%defattr(-, root, root)"
 	CLEANTEXT=""
@@ -428,8 +426,7 @@ for i in $LISTBUILT ; do
 
 	SPECNAME=$RPMTOPDIR/SPECS/$(spec_by_srpm $i)
 	test -f "$SPECNAME" || fatal "Spec $SPECNAME is not found"
-	showcmd altspec_to_local $SPECNAME
-	altspec_to_local $SPECNAME
+	docmd altspec_to_local $SPECNAME
 
 	docmd $BUILDCOMMAND $LISTRPMARGS $UPLOADARG $REMOTEBUILD $DISTRARG $SPECNAME || fatal "Can't build"
 	uni_rpmrm $SPECNAME || true

bin/rpmgs

@@ -428,8 +428,7 @@ do
 			test -d "$CURNAME" || CURNAME=$(get_tarballname "$i")
 			gear_update_from_tarball "$RPMSOURCEDIR/$FTB" "$CURNAME" $FORCEDOWNLOAD
 			rm -f "$RPMSOURCEDIR/$FTB"
-			showcmd git commit -m "just import $FTB with rpmgs script"
-			git commit -m "just import $FTB with rpmgs script"
+			docmd git commit -m "just import $FTB with rpmgs script"
 		fi
 	else
 		is_gear && echo "Skip tarball committing (run with version or with -f option)."

share/eterbuild/functions/build

@@ -63,8 +63,7 @@ uni_rpmbuild()
 
 		# build package without MENV checking
 		if true || [ "$MENV" = "SS" ] ; then
-			showcmd $GEAR $COMMIT $GEARRULES --rpmbuild -- $RPMBUILD "$TWOPARAM" "$THRPARAM" "$FOURPARAM" "$FIVEPARAM" "$SIXPARAM" $@
-			$NICE $GEAR $COMMIT $GEARRULES --rpmbuild -- $RPMBUILD "$TWOPARAM" "$THRPARAM" "$FOURPARAM" "$FIVEPARAM" "$SIXPARAM" $@ || RET=$?
+			docmd $NICE $GEAR $COMMIT $GEARRULES --rpmbuild -- $RPMBUILD "$TWOPARAM" "$THRPARAM" "$FOURPARAM" "$FIVEPARAM" "$SIXPARAM" "$@" || RET=$?
 			[ -z "$COMMANDAFTER" ] || docmd $COMMANDAFTER
 		else
 			fatal "Build backported src.rpm from git is unsupported now"
@@ -74,8 +73,7 @@ uni_rpmbuild()
 		fi
 	else
 		mkdir -p $RPMTOPDIR/BUILD $RPMTOPDIR/SRPMS
-		showcmd $RPMBUILD "$TWOPARAM" "$THRPARAM" "$FOURPARAM" "$FIVEPARAM" "$SIXPARAM" $@
-		$NICE $RPMBUILD "$TWOPARAM" "$THRPARAM" "$FOURPARAM" "$FIVEPARAM" "$SIXPARAM" $@ || RET=$?
+		docmd $NICE $RPMBUILD "$TWOPARAM" "$THRPARAM" "$FOURPARAM" "$FIVEPARAM" "$SIXPARAM" "$@" || RET=$?
 	fi
 
 	return $RET
@@ -93,11 +91,9 @@ uni_buildreq()
 	local GEARBUILDREQ=gear-buildreq
 
 	if is_gear $SPECDIR ; then
-		showcmd $GEARBUILDREQ $BUILDREQPARAM --commit -- "$SPECNAME" $@
-		$NICE $GEARBUILDREQ $BUILDREQPARAM --commit -- "$SPECNAME" $@ || RET=$?
+		docmd $NICE $GEARBUILDREQ $BUILDREQPARAM --commit -- "$SPECNAME" "$@" || RET=$?
 	else
-		showcmd buildreq $BUILDREQPARAM "$SPECNAME" $@
-		$NICE buildreq $BUILDREQPARAM "$SPECNAME" $@ || RET=$?
+		docmd $NICE buildreq $BUILDREQPARAM "$SPECNAME" "$@" || RET=$?
 	fi
 	return $RET
 }
@@ -116,8 +112,7 @@ uni_rpminstall()
 	#else
 		echo -n "Install package "
 		docmd mkdir -p $RPMTOPDIR/SOURCES $RPMTOPDIR/SRPMS $RPMTOPDIR/RPMS
-		showcmd rpm -iv "$TWOPARAM" $@
-		rpm -iv "$TWOPARAM" $@ || RET=$?
+		docmd rpm -iv "$TWOPARAM" "$@" || RET=$?
 	#fi
 	return $RET
 }
@@ -131,7 +126,6 @@ uni_rpmrm()
 		TWOPARAM="--define=_topdir $RPMTOPDIR"
 	fi
 
-	showcmd $RPMBUILD "$TWOPARAM" --rmsource --rmspec --nodeps $@
-	$RPMBUILD "$TWOPARAM" --rmsource --rmspec --nodeps $@
+	docmd $RPMBUILD "$TWOPARAM" --rmsource --rmspec --nodeps "$@"
 }
 

share/eterbuild/functions/buildsrpm

@@ -40,8 +40,7 @@ uni_rpmbuildsrpm()
 
 		# build package without MENV checking
 		if true || [ "$MENV" = "SS" ] ; then
-			showcmd $GEAR $COMMIT $GEARRULES --rpmbuild -- $RPMBUILD "$ONEPARAM" "$TWOPARAM" "$THRPARAM" $@
-			$NICE $GEAR $COMMIT $GEARRULES --rpmbuild -- $RPMBUILD "$ONEPARAM" "$TWOPARAM" "$THRPARAM" $@ || RET=$?
+			docmd $NICE $GEAR $COMMIT $GEARRULES --rpmbuild -- $RPMBUILD "$ONEPARAM" "$TWOPARAM" "$THRPARAM" "$@" || RET=$?
 			[ -z "$COMMANDAFTER" ] || docmd $COMMANDAFTER
 		else
 			fatal "Build backported src.rpm from git is unsupported now"
@@ -51,8 +50,7 @@ uni_rpmbuildsrpm()
 		fi
 	else
 		mkdir -p $RPMTOPDIR/BUILD $RPMTOPDIR/SRPMS
-		showcmd $RPMBUILD "$ONEPARAM" "$TWOPARAM" "$THRPARAM" $@
-		$NICE $RPMBUILD "$ONEPARAM" "$TWOPARAM" "$THRPARAM" $@ || RET=$?
+		docmd $NICE $RPMBUILD "$ONEPARAM" "$TWOPARAM" "$THRPARAM" "$@" || RET=$?
 	fi
 
 	return $RET

share/eterbuild/functions/common

@@ -302,7 +302,7 @@ docmd()
 	SETCOLOR_SUCCESS
 	echo " \$ $@"
 	SETCOLOR_NORMAL
-	$@
+	"$@"
 }
 
 # Print command line only

tests/test_docmd.sh

+#!/bin/sh
+
+. `dirname $0`/../share/eterbuild/functions/common
+#load_mod spec
+
+check()
+{
+	[ "$2" != "$3" ] && echo "FATAL with '$1': result '$2' do not match with '$3'" || echo "OK for '$1' with '$2'"
+}
+
+func()
+{
+docmd ls $@
+docmd ls "$@"
+ls "$@"
+}
+
+func 1 "1 2"
+func 1 2 3