update: nodemcu-pyflasher 5.0.0

2 files changed, 55 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 11cee64695e4..3d22cf952cb9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,16 @@
 pkgbase = nodemcu-pyflasher
 	pkgdesc = Self-contained NodeMCU flasher with GUI based on esptool.py and wxPython.
-	pkgver = 4.0
-	pkgrel = 2
+	pkgver = 5.0.0
+	pkgrel = 1
 	url = https://github.com/marcelstoer/nodemcu-pyflasher
-	arch = x86_64
+	arch = any
 	license = MIT
-	depends = pyinstaller
+	depends = python-pyserial
 	depends = python-wxpython
 	depends = esptool
-	source = nodemcu-pyflasher.tar.gz::https://github.com/marcelstoer/nodemcu-pyflasher/archive/v4.0.tar.gz
-	source = remove-create-dmg.patch
-	source = NodeMCU-PyFlasher.desktop
-	sha256sums = 728dcad6264bce7a4dddfdd627a95557e0e779ed6bd48d9773766eb6b9af4790
-	sha256sums = 260d5e1f6aa887680dfd0d00d248ecac70d7251f511049e0f0c745447b009975
-	sha256sums = d91b21677f659e5ea009a27796938e31517a1ecf281a0b1d9a523834e41ceb0b
+	depends = python-httplib2
+	source = nodemcu-pyflasher-5.0.0.tar.gz::https://github.com/marcelstoer/nodemcu-pyflasher/archive/v5.0.0.tar.gz
+	sha256sums = 7f2c1cefd82a3e6fa683cf132eaa1a3b8097324cd1a6c94ecf8e091a787a683f
 
 pkgname = nodemcu-pyflasher
 
diff --git a/PKGBUILD b/PKGBUILD
index f5db80774439..415e34cf0094 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,55 @@
-# Maintainer: yjun <jerrysteve1101@gmail.com>
+# Maintainer: yjun <jerrysteve1101 at gmail dot com>
 
 pkgname=nodemcu-pyflasher
-pkgver=4.0
-pkgrel=2
+pkgver=5.0.0
+pkgrel=1
 pkgdesc="Self-contained NodeMCU flasher with GUI based on esptool.py and wxPython."
-arch=("x86_64")
+arch=("any")
 url="https://github.com/marcelstoer/nodemcu-pyflasher"
+depends=(
+	'python-pyserial'
+	'python-wxpython'
+	'esptool'
+	'python-httplib2')
 license=('MIT')
-depends=('pyinstaller'
-		 'python-wxpython'
-		 'esptool')
-source=("${pkgname}.tar.gz::https://github.com/marcelstoer/${pkgname}/archive/v${pkgver}.tar.gz"
-		"remove-create-dmg.patch"
-		"NodeMCU-PyFlasher.desktop")
-sha256sums=('728dcad6264bce7a4dddfdd627a95557e0e779ed6bd48d9773766eb6b9af4790'
-            '260d5e1f6aa887680dfd0d00d248ecac70d7251f511049e0f0c745447b009975'
-            'd91b21677f659e5ea009a27796938e31517a1ecf281a0b1d9a523834e41ceb0b')
-prepare() {
-	cd "$pkgname-$pkgver"
-	patch --forward --strip=1 --input="$srcdir/remove-create-dmg.patch"
-}
-build() {
-	cd "$pkgname-$pkgver"
-	./build.sh
-}
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/marcelstoer/${pkgname}/archive/v${pkgver}.tar.gz")
+sha256sums=('7f2c1cefd82a3e6fa683cf132eaa1a3b8097324cd1a6c94ecf8e091a787a683f')
+
 package() {
-	cd "$pkgname-$pkgver"
-	install -Dm755 dist/NodeMCU-PyFlasher ${pkgdir}/usr/bin/NodeMCU-PyFlasher
-	install -Dm644 images/icon-64.png  ${pkgdir}/usr/share/pixmaps/NodeMCU-PyFlasher.png
-	install -Dm644 ${srcdir}/NodeMCU-PyFlasher.desktop  ${pkgdir}/usr/share/applications/NodeMCU-PyFlasher.desktop
+  cd "$pkgname-$pkgver"
+  
+  # script
+  install -Dm644 About.py -t ${pkgdir}/usr/share/${pkgname}
+  install -Dm644 HtmlPopupTransientWindow.py -t ${pkgdir}/usr/share/${pkgname}
+  install -Dm644 Main.py -t ${pkgdir}/usr/share/${pkgname}
+  install -Dm644 images.py -t ${pkgdir}/usr/share/${pkgname}
+  install -Dm755 ${pkgname}.py -t ${pkgdir}/usr/share/${pkgname}
+
+  # soft link
+  install -dm755 ${pkgdir}/usr/bin/
+  ln -sf /usr/share/${pkgname}/${pkgname}.py ${pkgdir}/usr/bin/${pkgname}
+
+  # images
+  find images -type f -exec install -Dm644 {} ${pkgdir}/usr/share/${pkgname}/{} \;
+
+  # icon
+  install -Dm644 images/icon-64.png  ${pkgdir}/usr/share/pixmaps/${pkgname}.png
+  
+  # LICENSE
+  install -Dm644 LICENSE -t ${pkgdir}/usr/share/licenses/${pkgname}
+  
+  # desktop entry
+  install -dm755 ${pkgdir}/usr/share/applications 
+  cat > ${pkgdir}/usr/share/applications/${pkgname}.desktop << EOF
+[Desktop Entry]
+Type=Application
+Version=${pkgver}
+Name=${pkgname}
+Comment=ModeMCU Flash Tool
+Exec=/usr/bin/${pkgname}
+Icon=${pkgname}
+Terminal=false
+EOF
 }
+
+# vim: sw=2 ts=2 et: