Commit 649af257 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm pack: use erc via epm tool erc

parent 90ae0840
...@@ -24,6 +24,11 @@ subst() ...@@ -24,6 +24,11 @@ subst()
} }
fi fi
erc()
{
epm tool erc "$@"
}
is_dir_empty() is_dir_empty()
{ {
[ -z "$(ls -A "$1")" ] [ -z "$(ls -A "$1")" ]
......
...@@ -20,9 +20,6 @@ tdir=$(mktemp -d) ...@@ -20,9 +20,6 @@ tdir=$(mktemp -d)
trap "rm -fr $tdir" EXIT trap "rm -fr $tdir" EXIT
cd $tdir || fatal cd $tdir || fatal
# TODO: embed erc to epm
epm assure erc || epm ei erc || fatal
if echo "$TAR" | grep -q "far2l_portable.*.tar.gz" ; then if echo "$TAR" | grep -q "far2l_portable.*.tar.gz" ; then
erc $TAR || fatal erc $TAR || fatal
RUNFILE="$(echo $tdir/far2l*.run)" RUNFILE="$(echo $tdir/far2l*.run)"
......
...@@ -13,9 +13,6 @@ PKGDIR="$(mktemp -d)" ...@@ -13,9 +13,6 @@ PKGDIR="$(mktemp -d)"
trap "rm -fr $PKGDIR" EXIT trap "rm -fr $PKGDIR" EXIT
cd $PKGDIR || fatal cd $PKGDIR || fatal
# TODO: embed erc to epm
epm assure erc || epm ei erc || fatal
# use version from tarball # use version from tarball
PKGNAME="$(basename $TAR .tar.gz)" PKGNAME="$(basename $TAR .tar.gz)"
......
...@@ -6,8 +6,6 @@ RETURNTARNAME="$2" ...@@ -6,8 +6,6 @@ RETURNTARNAME="$2"
. $(dirname $0)/common.sh . $(dirname $0)/common.sh
epm assure erc || epm ei erc || fatal
CURDIR="$(pwd)" CURDIR="$(pwd)"
PKGDIR="$(mktemp -d)" PKGDIR="$(mktemp -d)"
...@@ -15,12 +13,12 @@ trap "rm -fr $PKGDIR" EXIT ...@@ -15,12 +13,12 @@ trap "rm -fr $PKGDIR" EXIT
cd $PKGDIR || fatal cd $PKGDIR || fatal
if echo "$TAR" | grep Linux_Universal_Driver.zip ; then if echo "$TAR" | grep Linux_Universal_Driver.zip ; then
a= erc $TAR || fatal erc $TAR || fatal
TAR=$(echo KyoceraLinuxPackages-*.tar.gz) TAR=$(echo KyoceraLinuxPackages-*.tar.gz)
fi fi
if echo "$TAR" | grep KyoceraLinuxPackages ; then if echo "$TAR" | grep KyoceraLinuxPackages ; then
a= erc $TAR || fatal erc $TAR || fatal
else else
fatal "How no idea how to handle $TAR" fatal "How no idea how to handle $TAR"
fi fi
......
...@@ -14,7 +14,6 @@ VERSION="$(epm tool eget -O- https://api.github.com/repos/Castro-Fidel/PortWINE/ ...@@ -14,7 +14,6 @@ VERSION="$(epm tool eget -O- https://api.github.com/repos/Castro-Fidel/PortWINE/
PKGNAME=portproton-$VERSION.tar PKGNAME=portproton-$VERSION.tar
epm assure erc || fatal
erc repack "$TAR" "$PKGNAME" || fatal erc repack "$TAR" "$PKGNAME" || fatal
return_tar "$PKGNAME" return_tar "$PKGNAME"
......
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