use setup.py

2 files changed, 26 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a425df745e7..1d2da2ea3b6c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vasisualy-git
 	pkgdesc = Vasisualy is a simple Russian voice assistant written on python 3 for GNU/Linux and Windows.
-	pkgver = r110.20210302
-	pkgrel = 2
+	pkgver = 0.6.2
+	pkgrel = 1
 	url = https://github.com/Oknolaz/vasisualy
 	arch = i686
 	arch = x86_64
@@ -19,6 +19,7 @@ pkgbase = vasisualy-git
 	depends = python-geocoder
 	depends = python-translate
 	depends = python-lxml
+	depends = python-sounddevice
 	depends = python-beautifulsoup4
 	depends = python-qt-material
 	depends = python-speechrecognition
diff --git a/PKGBUILD b/PKGBUILD
index f8d9c268634a..47d4b45d1540 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
 # Contributor: vantu5z <vantu5z@mail.ru>
 
 pkgname=vasisualy-git
-pkgver=r110.20210302
-pkgrel=2
+pkgver=0.6.2
+pkgrel=1
 pkgdesc="Vasisualy is a simple Russian voice assistant written on python 3 for GNU/Linux and Windows."
 arch=('i686' 'x86_64')
 url="https://github.com/Oknolaz/vasisualy"
 license=('GPL3')
 depends=('python>3' 'rhvoice' 'speech-dispatcher' 'python-pyqt5' 'python-vlc'
          'python-shell' 'python-pyowm' 'python-mss' 'python-wikipedia'
-         'python-geocoder' 'python-translate' 'python-lxml'
+         'python-geocoder' 'python-translate' 'python-lxml' 'python-sounddevice'
          'python-beautifulsoup4' 'python-qt-material' 'python-speechrecognition')
 makedepends=('git')
 provides=("${pkgname%-git}")
@@ -22,43 +22,31 @@ sha256sums=('SKIP'
             'SKIP')
 
 pkgver() {
-	cd $pkgname
-	# get number of last git commit
-	_commitCount=$(git rev-list --count HEAD)
-	# get time of last git commit
-	_commitTime=$(git show -s --format="%ci" | grep -o "....-..-.." | sed "s/-//g")
-	# add "r*.*" from package version
-	echo "r$_commitCount.$_commitTime"
+    cd ${pkgname}
+    echo $(python setup.py --version)
+}
+
+build() {
+    cd "${srcdir}/${pkgname}"
+    python setup.py build
+
+    cd "${srcdir}/${pkgname}-pi"
+    python setup.py build
 }
 
 package()
 {
-    #site_pkg=$(python -c "import site; print(site.getsitepackages()[0])")
-    site_pkg="usr/share"
-    modulename=${pkgname%-git}
-    modulename_pi=${pkgname%-git}-pi
-
-    cd ${pkgname}-files
-    install -Dm0755 "vasisualy"    "${pkgdir}/usr/bin/vasisualy"
-    install -Dm0755 "vasisualy-pi" "${pkgdir}/usr/bin/vasisualy-pi"
+    cd "${pkgname}-files"
     install -Dm0755 "vasisualy.desktop" "${pkgdir}/usr/share/applications/vasisualy.desktop"
 
-    cd $srcdir/$pkgname
-    install -Dm0755 "main.py" "${pkgdir}/${site_pkg}/${modulename}/main.py"
-    cp -R "assets" "${pkgdir}/${site_pkg}/${modulename}"
-    cp -R "core"   "${pkgdir}/${site_pkg}/${modulename}"
-    cp -R "music"  "${pkgdir}/${site_pkg}/${modulename}"
-    cp -R "skills" "${pkgdir}/${site_pkg}/${modulename}"
-    cp -R "ui"     "${pkgdir}/${site_pkg}/${modulename}"
-    install -Dm0644 "ui/vas.png" "${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/vasisualy.png"
-    install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${modulename}/LICENSE"
+    cd "${srcdir}/${pkgname}"
+    python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+    install -Dm0755 "run.py"     "${pkgdir}/usr/bin/vasisualy"
+    install -Dm0644 "vasisualy/ui/vas.png" "${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/vasisualy.png"
+    install -Dm0644 LICENSE      "${pkgdir}/usr/share/licenses/${pkgname%-git}/LICENSE"
 
-    cd $srcdir/${pkgname}-pi
-    install -Dm0755 "main.py" "${pkgdir}/${site_pkg}/${modulename_pi}/main.py"
-    cp -R "assets" "${pkgdir}/${site_pkg}/${modulename_pi}"
-    cp -R "core"   "${pkgdir}/${site_pkg}/${modulename_pi}"
-    cp -R "music"  "${pkgdir}/${site_pkg}/${modulename_pi}"
-    cp -R "skills" "${pkgdir}/${site_pkg}/${modulename_pi}"
-    cp -R "ui"     "${pkgdir}/${site_pkg}/${modulename_pi}"
-    install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${modulename_pi}/LICENSE"
+    cd "${srcdir}/${pkgname}-pi"
+    python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+    install -Dm0755 "run.py" "${pkgdir}/usr/bin/vasisualy-pi"
+    install -Dm0644 LICENSE  "${pkgdir}/usr/share/licenses/${pkgname%-git}-pi/LICENSE"
 }