Update to 2.1 on GitHub

2 files changed, 11 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ecec763a89d..f6f420a3c25a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = dex2jar
 	pkgdesc = Tools to work with android .dex and java .class files
-	pkgver = 2.0
+	pkgver = 2.1
 	pkgrel = 1
-	url = http://sourceforge.net/projects/dex2jar/
+	url = https://github.com/pxb1988/dex2jar
 	arch = any
 	license = Apache
 	depends = java-runtime
-	source = http://sourceforge.net/projects/dex2jar/files/dex2jar-2.0.zip
-	sha1sums = 9df351a67db5f327fb3726bb7b5c795029547301
+	depends = bash
+	source = https://github.com/pxb1988/dex2jar/releases/download/v2.1/dex2jar-2.1.zip
+	sha256sums = 7a9bdf843d43de4d1e94ec2e7b6f55825017b0c4a7ee39ff82660e2493a46f08
 
 pkgname = dex2jar
-
diff --git a/PKGBUILD b/PKGBUILD
index 59373c277595..6da326d9f990 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,18 @@
 # Maintainer: Peter Wu <lekensteyn at gmail dot com>
 # Contributor: Andreas Schönfelder <passtschu at freenet dot de>
 pkgname=dex2jar
-pkgver=2.0
+pkgver=2.1
 pkgrel=1
 pkgdesc="Tools to work with android .dex and java .class files"
 arch=(any)
-url="http://sourceforge.net/projects/dex2jar/"
+url="https://github.com/pxb1988/dex2jar"
 license=('Apache')
-depends=('java-runtime')
-source=("http://sourceforge.net/projects/dex2jar/files/${pkgname}-${pkgver}.zip")
-sha1sums=('9df351a67db5f327fb3726bb7b5c795029547301')
+depends=('java-runtime' 'bash')
+source=("https://github.com/pxb1988/dex2jar/releases/download/v${pkgver}/dex2jar-${pkgver}.zip")
+sha256sums=('7a9bdf843d43de4d1e94ec2e7b6f55825017b0c4a7ee39ff82660e2493a46f08')
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/dex-tools-$pkgver"
 
   mkdir -p "$pkgdir/usr/bin/"
   mkdir -p "$pkgdir/opt/dex2jar/lib/"
@@ -21,9 +21,6 @@ package() {
   install -m644 lib/*.jar "$pkgdir/opt/dex2jar/lib/"
 
   ln -s /opt/dex2jar/d2j-dex2jar.sh "$pkgdir/usr/bin/dex2jar"
-  # TODO: should d2j-* be installed to /usr/bin? too.
-  # dex2jar.sh is gone in dex2jar-2.0, should both d2j-dex2jar and dex2jar be
-  # installed, or just dex2jar?
 }
 
 # vim:set ts=2 sw=2 et: