Commit 061a8241 authored by Vitaly Lipatov's avatar Vitaly Lipatov

last fix docmd using

parent a4cc3714
...@@ -74,7 +74,7 @@ uni_rpmbuild() ...@@ -74,7 +74,7 @@ uni_rpmbuild()
fi fi
else else
mkdir -p $RPMTOPDIR/BUILD $RPMTOPDIR/SRPMS mkdir -p $RPMTOPDIR/BUILD $RPMTOPDIR/SRPMS
show $RPMBUILD "$ONEPARAM" "$TWOPARAM" "$THRPARAM" "$FOURPARAM" "$FIVEPARAM" $@ showcmd $RPMBUILD "$ONEPARAM" "$TWOPARAM" "$THRPARAM" "$FOURPARAM" "$FIVEPARAM" $@
$NICE $RPMBUILD "$ONEPARAM" "$TWOPARAM" "$THRPARAM" "$FOURPARAM" "$FIVEPARAM" $@ || RET=$? $NICE $RPMBUILD "$ONEPARAM" "$TWOPARAM" "$THRPARAM" "$FOURPARAM" "$FIVEPARAM" $@ || RET=$?
fi fi
#[ -n "$VERBOSE" ] && echo "Run $RPMBUILD $ONEPARAM $TWOPARAM $THRPARAM $FOURPARAM $FIVEPARAM $@" || : #[ -n "$VERBOSE" ] && echo "Run $RPMBUILD $ONEPARAM $TWOPARAM $THRPARAM $FOURPARAM $FIVEPARAM $@" || :
...@@ -116,7 +116,8 @@ uni_rpminstall() ...@@ -116,7 +116,8 @@ uni_rpminstall()
#else #else
echo -n "Install package " echo -n "Install package "
docmd mkdir -p $RPMTOPDIR/SOURCES $RPMTOPDIR/SRPMS $RPMTOPDIR/RPMS docmd mkdir -p $RPMTOPDIR/SOURCES $RPMTOPDIR/SRPMS $RPMTOPDIR/RPMS
docmd rpm -iv "$TWOPARAM" $@ || RET=$? showcmd rpm -iv "$TWOPARAM" $@
rpm -iv "$TWOPARAM" $@ || RET=$?
#fi #fi
return $RET return $RET
} }
...@@ -130,7 +131,8 @@ uni_rpmrm() ...@@ -130,7 +131,8 @@ uni_rpmrm()
TWOPARAM="--define=_topdir $RPMTOPDIR" TWOPARAM="--define=_topdir $RPMTOPDIR"
fi fi
docmd $RPMBUILD "$TWOPARAM" --rmsource --rmspec --nodeps $@ showcmd $RPMBUILD "$TWOPARAM" --rmsource --rmspec --nodeps $@
$RPMBUILD "$TWOPARAM" --rmsource --rmspec --nodeps $@
} }
......
...@@ -90,6 +90,8 @@ prepare_aptconfig() ...@@ -90,6 +90,8 @@ prepare_aptconfig()
$ETERBUILD_APTREPO $ETERBUILD_APTREPO
EOF EOF
fi fi
echo "Apt sources from $OURSOURCES:" echo
echog "Apt sources from $OURSOURCES:"
cat $OURSOURCES | grep -v "^#" | grep -v "^\$" | grep rpm cat $OURSOURCES | grep -v "^#" | grep -v "^\$" | grep rpm
echo
} }
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