summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFacundo Tuesca2018-01-14 11:25:25 -0300
committerFacundo Tuesca2018-01-14 11:25:25 -0300
commitdccd8eb5de87ab177b470e159b586f007d71d3b1 (patch)
treecc960018b8747acf8dea6d8cac999a059fa70d10
parentc39c3a422db0533a00af3ba8153a7bc21da5d0f2 (diff)
downloadaur-dccd8eb5de87ab177b470e159b586f007d71d3b1.tar.gz
Use bsdtar and remove unnecessary archictecture checks
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD14
-rw-r--r--iscan-plugin-v330.install12
3 files changed, 12 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f453eef58a23..df8a25066bb8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,17 @@
pkgbase = iscan-plugin-v330
pkgdesc = iscan plugin for Epson Perfection Photo V330 scanners.
pkgver = 0.2.0
- pkgrel = 6
+ pkgrel = 7
url = http://www.epson.com
install = iscan-plugin-v330.install
arch = i686
arch = x86_64
license = custom
- makedepends = rpmextract
depends = iscan
+ source_i686 = https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x86/iscan-perfection-v330-bundle-1.0.1.x86.rpm.tar.gz
+ sha256sums_i686 = 29e71557d7cd4b64bac8088c3f0f53459c5a5b72a92496ced98ea624bdac72c2
+ source_x86_64 = https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-1.0.1.x64.rpm.tar.gz
+ sha256sums_x86_64 = f6fa455f04cdfbc3d38526573260746e9546830de93ba182d0365f557d2f7df9
pkgname = iscan-plugin-v330
diff --git a/PKGBUILD b/PKGBUILD
index 9406819beddf..ef97fbea32a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,27 @@
pkgname=iscan-plugin-v330
pkgver=0.2.0
-pkgrel=6
+pkgrel=7
pkgdesc="iscan plugin for Epson Perfection Photo V330 scanners."
arch=('i686' 'x86_64')
url="http://www.epson.com"
license=('custom')
depends=('iscan')
-makedepends=('rpmextract')
install=iscan-plugin-v330.install
+source_x86_64=(https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-1.0.1.x64.rpm.tar.gz)
+source_i686=(https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x86/iscan-perfection-v330-bundle-1.0.1.x86.rpm.tar.gz)
+sha256sums_i686=('29e71557d7cd4b64bac8088c3f0f53459c5a5b72a92496ced98ea624bdac72c2')
+sha256sums_x86_64=('f6fa455f04cdfbc3d38526573260746e9546830de93ba182d0365f557d2f7df9')
if [ "$CARCH" = "i686" ] ; then
- source=(https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x86/iscan-perfection-v330-bundle-1.0.1.x86.rpm.tar.gz)
ARCH=i386
- md5sums=('86006772843ebfb145c10c7d50a38307')
-
elif [ "$CARCH" = "x86_64" ] ; then
- source=(https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-1.0.1.x64.rpm.tar.gz)
ARCH=x86_64
- md5sums=('888a55ae8406730f1fe60a779f398316')
fi
build() {
mv "$srcdir/iscan-perfection-v330-bundle-1.0.1.x64.rpm/plugins/esci-interpreter-perfection-v330-${pkgver}-1.$ARCH.rpm" "$srcdir/"
- rpmextract.sh "esci-interpreter-perfection-v330-${pkgver}-1.$ARCH.rpm"
+ bsdtar -x -f "esci-interpreter-perfection-v330-${pkgver}-1.$ARCH.rpm"
if [ "$CARCH" = "x86_64" ] ; then
mv usr/lib64 usr/lib
diff --git a/iscan-plugin-v330.install b/iscan-plugin-v330.install
index d24716c879f8..ec690c5bd899 100644
--- a/iscan-plugin-v330.install
+++ b/iscan-plugin-v330.install
@@ -1,19 +1,9 @@
post_install() {
- ARCH=`uname -m`
echo "Running iscan-registry to register plugin and firmware with iscan."
- if [ "x$ARCH" == "xi686" ]; then
- iscan-registry -a interpreter usb 0x04b8 0x0142 /usr/lib/esci/libesci-interpreter-perfection-v330 /usr/share/esci/esfwad.bin
- else
- iscan-registry -a interpreter usb 0x04b8 0x0142 /usr/lib64/esci/libesci-interpreter-perfection-v330 /usr/share/esci/esfwad.bin
- fi
+ iscan-registry -a interpreter usb 0x04b8 0x0142 /usr/lib/esci/libesci-interpreter-perfection-v330 /usr/share/esci/esfwad.bin
}
pre_remove() {
- ARCH=`uname -m`
echo "Unregistering plugin and firmware from iscan."
- if [ "x$ARCH" == "xi686" ]; then
iscan-registry -r interpreter usb 0x04b8 0x0142 /usr/lib/esci/libesci-interpreter-perfection-v330 /usr/share/esci/esfwad.bin
- else
- iscan-registry -r interpreter usb 0x04b8 0x0142 /usr/lib64/esci/libesci-interpreter-perfection-v330 /usr/share/esci/esfwad.bin
- fi
}