fixed compilation

3 files changed, 8 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 78c80808f1d5..fc2292b9c363 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lxdui-git
 	pkgdesc = Web UI for the native Linux container technology LXD/LXC
-	pkgver = 0
+	pkgver = 2.2.0.839.48e1e06
 	pkgrel = 1
 	url = https://github.com/AdaptiveScale/lxdui
 	install = lxdui.install
@@ -23,7 +23,7 @@ pkgbase = lxdui-git
 	backup = etc/lxdui/lxdui.conf
 	backup = etc/lxdui/log.conf
 	backup = etc/lxdui/auth.conf
-	source = lxdui-git::git+https://github.com/AdaptiveScale/lxdui
+	source = lxdui-git::git+https://github.com/AdaptiveScale/lxdui#branch=develop
 	source = lxdui.conf
 	source = lxdui.sysusers
 	source = lxdui.tmpfiles
@@ -34,7 +34,6 @@ pkgbase = lxdui-git
 	sha256sums = b149cf164d32659b95802d0e4e455e98736de0d0ece519c48eae2eb846c35f3c
 	sha256sums = 4f96bb6af509e6dacf97e2298da9f2bf783f46279c6957ed288fed478206696d
 	sha256sums = 7487a9b77522a23b1be4c02961f46917d48b9c617d669843bbf26c4fd285d75d
-	sha256sums = 929c933ed0085d74972fd20c14f07b01ad4aaaff93c84897527868424447ef1f
+	sha256sums = 832a8e044f4eaa0221a151f6cfc7a7f99c97bb5526944585d2fbf4d5162433f6
 
 pkgname = lxdui-git
-
diff --git a/0010-paths.patch b/0010-paths.patch
index bd4ed499de31..758c8c7f5114 100644
--- a/0010-paths.patch
+++ b/0010-paths.patch
@@ -18,18 +18,6 @@ diff -rNc lxdui-2.1.1-orig/app/api/core.py lxdui-2.1.1/app/api/core.py
   
   # Authentication section
   initAuth(app)
-***************
-*** 133,136 ****
-      print("LXDUI started. Running on http://0.0.0.0:{}".format(port))
-      print("PID={}, Press CTRL+C to quit".format(pid))
-      terminal(app, port, debug)
-!     # app.run(debug=debug, host='0.0.0.0', port=port)
-\ No newline at end of file
---- 133,136 ----
-      print("LXDUI started. Running on http://0.0.0.0:{}".format(port))
-      print("PID={}, Press CTRL+C to quit".format(pid))
-      terminal(app, port, debug)
-!     # app.run(debug=debug, host='0.0.0.0', port=port)
 diff -rNc lxdui-2.1.1-orig/app/__metadata__.py lxdui-2.1.1/app/__metadata__.py
 *** lxdui-2.1.1-orig/app/__metadata__.py	2018-06-18 22:36:37.000000000 +0300
 --- lxdui-2.1.1/app/__metadata__.py	2018-07-02 15:35:41.889414434 +0300
diff --git a/PKGBUILD b/PKGBUILD
index 9785b596057f..2bcd1ca81694 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: pappy <pappy _AT_ a s c e l i o n _DOT_ com>
+# Maintainer: pappy <pa314159@users.noreply.github.com>
 
 _pkgname=lxdui
 pkgname=$_pkgname-git
-pkgver=0
+pkgver=2.2.0.839.48e1e06
 pkgrel=1
 
 srcver() {
@@ -40,7 +40,7 @@ install=lxdui.install
 backup=(etc/lxdui/lxdui.conf
 		etc/lxdui/log.conf
 		etc/lxdui/auth.conf)
-source=($pkgname::git+https://github.com/AdaptiveScale/$_pkgname
+source=("$pkgname::git+https://github.com/AdaptiveScale/$_pkgname#branch=develop"
 
 		$_pkgname.conf
 		$_pkgname.sysusers
@@ -54,7 +54,7 @@ sha256sums=('SKIP'
             'b149cf164d32659b95802d0e4e455e98736de0d0ece519c48eae2eb846c35f3c'
             '4f96bb6af509e6dacf97e2298da9f2bf783f46279c6957ed288fed478206696d'
             '7487a9b77522a23b1be4c02961f46917d48b9c617d669843bbf26c4fd285d75d'
-            '929c933ed0085d74972fd20c14f07b01ad4aaaff93c84897527868424447ef1f')
+            '832a8e044f4eaa0221a151f6cfc7a7f99c97bb5526944585d2fbf4d5162433f6')
 
 prepare()
 {
@@ -90,7 +90,7 @@ package() {
 	install -Dm644 $_pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$_pkgname.conf
 
 	PYVER=$($pkgdir/usr/lib/$_pkgname/bin/python --version|cut -d\  -f2|cut -d. -f1,2)
-	mv $pkgdir/usr/lib/$_pkgname/lib/python$PYVER/site-packages/LXDUI-$(srcver)-py$PYVER.egg/conf/* $pkgdir/etc/$_pkgname
+	mv $pkgdir/usr/lib/$_pkgname/lib/python$PYVER/site-packages/conf/* $pkgdir/etc/$_pkgname
 	chmod 600 $pkgdir/etc/$_pkgname/auth.conf
 }