summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew McGinn2016-05-29 15:11:36 -0400
committerMatthew McGinn2016-05-29 15:11:36 -0400
commit356a56ab5312cc5c8182627dc0fe1fb15c2400e0 (patch)
tree16d27da81c12703e14578b8d9207ca141b7b75f8
parent68930bffc587ac326e72eadf3355630241750ae6 (diff)
downloadaur-356a56ab5312cc5c8182627dc0fe1fb15c2400e0.tar.gz
Fixing namcap errors and cleaning up arch logic
-rw-r--r--PKGBUILD33
1 files changed, 16 insertions, 17 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 37ce1056e3ab..36a21da421b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,31 +2,30 @@
pkgname=wxtoimg
pkgver=2.10.11
pkgrel=1
-pkgdesc="software to decode APT and WEFAX signals from weather satellites"
+pkgdesc="Software to decode APT and WEFAX signals from weather satellites"
arch=('x86_64' 'i686')
url="http://www.wxtoimg.com/"
license=('custom')
-depends=('wget')
+depends=('libx11' 'sh')
+conflicts=('wxtoimg' 'xwxtoimg')
provides=('wxtoimg' 'xwxtoimg')
-source_x86_64=("http://wxtoimg.com/downloads/$pkgname-linux64-$pkgver-1.tar.gz")
-source_i686=("http://wxtoimg.com/downloads/$pkgname-linux-$pkgver.tar.gz")
-md5sums_x86_64=('773dcad83ac853e7ea622debcd99478d')
-md5sums_i686=('278b7dc098188beec20bde2169162279')
+case "$CARCH" in
+ x86_64)
+ source=("http://wxtoimg.com/downloads/$pkgname-linux64-$pkgver-1.tar.gz")
+ md5sums+=('773dcad83ac853e7ea622debcd99478d')
+ ;;
+ i686)
+ source=("http://wxtoimg.com/downloads/$pkgname-linux-$pkgver.tar.gz")
+ md5sums+=('278b7dc098188beec20bde2169162279')
+ ;;
+esac
DLAGENTS='http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u'
-prepare(){
- if [[ $(uname -ar | grep -q x86_64) -eq 1 ]]; then
- /usr/bin/wget $source_x86_64
- else
- /usr/bin/wget $source_i686
- fi
-}
-
package() {
mkdir -p ../pkg/$pkgname/usr/lib/$pkgname
mkdir -p ../pkg/$pkgname/usr/bin
- mv etc usr ../pkg/$pkgname/usr/lib/$pkgname/
+ mv etc ../pkg/$pkgname/usr/lib/$pkgname/
+ mv usr/local/bin/* ../pkg/$pkgname/usr/bin/
install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- ln -s /usr/lib/$pkgname/usr/local/bin/$pkgname ../pkg/$pkgname/usr/bin/xwxtoimg
- ln -s /usr/lib/$pkgname/usr/local/bin/$pkgname ../pkg/$pkgname/usr/bin
+ ln -nfs /usr/bin/$pkgname ../pkg/$pkgname/usr/bin/xwxtoimg
}