Temporary fix for markdown import issue

patch from n8henrie
use builtin venv and run octoprint without script

3 files changed, 18 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 365c3ae73325..65b639b7de2b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = octoprint-venv
-	pkgdesc = The snappy snappy web interface for your 3D printer! (virtualenv installation type)
+	pkgdesc = The snappy snappy web interface for your 3D printer! (venv installation type)
 	pkgver = 1.4.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://octoprint.org/
 	install = octoprint.install
 	arch = any
 	license = AGPL3
-	depends = python-virtualenv
+	depends = python
 	optdepends = ffmpeg: timelapse support
 	optdepends = mjpg-streamer: stream images from webcam
 	provides = octoprint
@@ -16,7 +16,7 @@ pkgbase = octoprint-venv
 	source = octoprint.sysusers
 	source = octoprint.tmpfiles
 	sha256sums = 46558dd965e2e60016f1b5aea4c559a48fa1d7dc6b03dcdd08efcbad034f72e8
-	sha256sums = c6fb02d68cbfb1806c6c66134f1fa211caa1a8b7176befee53757cf546fdd4b3
+	sha256sums = 70be0efa0f6a536ed8a89a81bfdb5a978b1036ffead09a4db2e4d67599e02302
 	sha256sums = 79d0f9fe053181eaa77f472b5235463ce217475d47fada9869f42d313b4651a9
 	sha256sums = 67f7844f39428058d59e2a7cb03b3d3077b5f4b0a136fc9dd123e6538a92e851
 
diff --git a/PKGBUILD b/PKGBUILD
index 5b3e14595260..b3a0a70fa7fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,42 +2,40 @@
 
 pkgname=octoprint-venv
 pkgver=1.4.0
-pkgrel=1
-pkgdesc="The snappy snappy web interface for your 3D printer! (virtualenv installation type)"
+pkgrel=2
+pkgdesc="The snappy snappy web interface for your 3D printer! (venv installation type)"
 arch=('any')
 url="http://octoprint.org/"
 license=('AGPL3')
-depends=('python-virtualenv' )
+depends=('python')
 optdepends=('ffmpeg: timelapse support'
             'mjpg-streamer: stream images from webcam')
 provides=('octoprint')
 conflicts=('octoprint')
-install="octoprint.install"
+install=octoprint.install
 source=("https://github.com/foosel/OctoPrint/archive/${pkgver}.tar.gz"
         'octoprint.service'
         'octoprint.sysusers'
         'octoprint.tmpfiles')
 sha256sums=('46558dd965e2e60016f1b5aea4c559a48fa1d7dc6b03dcdd08efcbad034f72e8'
-            'c6fb02d68cbfb1806c6c66134f1fa211caa1a8b7176befee53757cf546fdd4b3'
+            '70be0efa0f6a536ed8a89a81bfdb5a978b1036ffead09a4db2e4d67599e02302'
             '79d0f9fe053181eaa77f472b5235463ce217475d47fada9869f42d313b4651a9'
             '67f7844f39428058d59e2a7cb03b3d3077b5f4b0a136fc9dd123e6538a92e851')
 
-
 package() {
     cd "${srcdir}/OctoPrint-${pkgver}"
-    
-    virtualenv "${pkgdir}/opt/$pkgname"
-    "${pkgdir}/opt/$pkgname/bin/python" setup.py install --optimize=1
+
+    python3 -m venv "${pkgdir}/opt/$pkgname"
+    "${pkgdir}/opt/$pkgname/bin/python3" setup.py install --optimize=1
     sed -i "s|${pkgdir}/opt/$pkgname|/opt/$pkgname|g" "${pkgdir}/opt/$pkgname/bin/"* # relocate without breaking plugin system
-    
+
     install -Dm644 "${srcdir}/octoprint.service" "${pkgdir}/usr/lib/systemd/system/octoprint.service"
     install -Dm644 "${srcdir}/octoprint.sysusers" "${pkgdir}/usr/lib/sysusers.d/octoprint.conf"
     install -Dm644 "${srcdir}/octoprint.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/octoprint.conf"
-    
-    install -d "${pkgdir}/usr/bin/"
-    ln -s /opt/$pkgname/bin/octoprint "${pkgdir}/usr/bin/octoprint"
-    
+
+#     install -d "${pkgdir}/usr/bin/"
+#     ln -s /opt/$pkgname/bin/octoprint "${pkgdir}/usr/bin/octoprint"
+
     install -d "${pkgdir}/var/lib/octoprint" "${pkgdir}/etc/"
     ln -s /var/lib/octoprint/.octoprint/ "${pkgdir}/etc/octoprint"
-    
 }
diff --git a/octoprint.service b/octoprint.service
index 8067c18418d1..a1006655f2d8 100644
--- a/octoprint.service
+++ b/octoprint.service
@@ -6,9 +6,8 @@ After=network.target
 User=octoprint
 Group=octoprint
 Type=simple
-ExecStart=/usr/bin/octoprint serve
+ExecStart=/opt/octoprint-venv/bin/python -m octoprint serve
 Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
-