Commit 37c68a13 authored by Vitaly Lipatov's avatar Vitaly Lipatov

use EPMCMD instead epm

parent 88654461
...@@ -134,7 +134,7 @@ echog "Prepare hasher in $HASHERDIR ..." ...@@ -134,7 +134,7 @@ echog "Prepare hasher in $HASHERDIR ..."
UTILPKG="mc eepm" UTILPKG="mc eepm"
# GNOME program needs dbus-tools-gui # GNOME program needs dbus-tools-gui
if epm requires $LISTNAMES 2>/dev/null | grep -q dbus ; then if $EPMCMD requires $LISTNAMES 2>/dev/null | grep -q dbus ; then
echo "dbus using detected, add dbus-tools-gui" echo "dbus using detected, add dbus-tools-gui"
UTILPKG="$UTILPKG dbus-tools-gui" UTILPKG="$UTILPKG dbus-tools-gui"
fi fi
......
...@@ -69,7 +69,7 @@ if [ -n "$PRINTBINPKG" ] ; then ...@@ -69,7 +69,7 @@ if [ -n "$PRINTBINPKG" ] ; then
RPMHASHERDIR=$HASHERDIR/repo/$BUILDARCH/RPMS.hasher RPMHASHERDIR=$HASHERDIR/repo/$BUILDARCH/RPMS.hasher
for i in $LISTNAMES ; do for i in $LISTNAMES ; do
#echog "Find binary packages for '$(basename $i)' in $RPMHASHERDIR ..." #echog "Find binary packages for '$(basename $i)' in $RPMHASHERDIR ..."
BINPACKAGES="$BINPACKAGES $(epm print binpkgfilelist $RPMHASHERDIR $i)" BINPACKAGES="$BINPACKAGES $($EPMCMD print binpkgfilelist $RPMHASHERDIR $i)"
done done
test -n "$BINPACKAGES" || fatal "Can't find any binary packages for $LISTNAMES in $(ls -l $RPMHASHERDIR)" test -n "$BINPACKAGES" || fatal "Can't find any binary packages for $LISTNAMES in $(ls -l $RPMHASHERDIR)"
......
...@@ -40,9 +40,9 @@ fi ...@@ -40,9 +40,9 @@ fi
# TODO --short # TODO --short
#PACKAGE=$(epmqf --quiet --short "$1") #PACKAGE=$(epmqf --quiet --short "$1")
COMMAND="$1" COMMAND="$1"
PACKAGE=$(epmqf --quiet "$COMMAND" 2>/dev/null) PACKAGE=$($EPMCMD qf --quiet "$COMMAND" 2>/dev/null)
if [ -n "$PACKAGE" ] ; then if [ -n "$PACKAGE" ] ; then
PACKAGE=$(echo "$PACKAGE" | epm print name for package) PACKAGE=$(echo "$PACKAGE" | $EPMCMD print name for package)
else else
PACKAGE="$COMMAND" PACKAGE="$COMMAND"
fi fi
......
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