Update for new installation method.

4 files changed, 28 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ae3891629ea6..cdfff5c29cb5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,17 @@
 pkgbase = maxima-jupyter-git
 	pkgdesc = A Maxima kernel for Jupyter, based on CL-Jupyter (Common Lisp kernel)
-	pkgver = r303.b3da307
+	pkgver = r356.d9121c1
 	pkgrel = 1
 	url = https://github.com/robert-dodier/maxima-jupyter
 	arch = any
 	license = BSD
 	depends = maxima
-	source = maxima-jupyter-git::git+https://github.com/robert-dodier/maxima-jupyter
+	source = maxima-jupyter-git::git+https://github.com/robert-dodier/maxima-jupyter.git
+	source = https://beta.quicklisp.org/quicklisp.lisp
+	source = load.lisp
 	sha256sums = SKIP
+	sha256sums = 4a7a5c2aebe0716417047854267397e24a44d0cce096127411e9ce9ccfeb2c17
+	sha256sums = e7063f56f8308a9cc728f1f51964a4f0bcc762b6ffe69b8c57c6b021e2fafe73
 
 pkgname = maxima-jupyter-git
 
diff --git a/.gitignore b/.gitignore
index 447971390520..3d18601d9271 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
+*.pkg.tar.xz
+common-lisp-jupyter-git/
 maxima-jupyter-git/
 pkg/
-src/
-*.pkg.tar.xz
 quicklisp.lisp
+quicklisp.lisp.asc
+src/
+ziz-git/
diff --git a/PKGBUILD b/PKGBUILD
index 241ccea828eb..e83c6f841e87 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Tarn Burton <twburton at gmail dot com>
 pkgname=maxima-jupyter-git
-pkgver=r303.b3da307
+pkgver=r356.d9121c1
 pkgrel=1
 pkgdesc="A Maxima kernel for Jupyter, based on CL-Jupyter (Common Lisp kernel)"
 arch=("any")
@@ -8,8 +8,12 @@ url="https://github.com/robert-dodier/maxima-jupyter"
 license=('BSD')
 depends=("maxima")
 source=(
-  "$pkgname::git+https://github.com/robert-dodier/maxima-jupyter")
-sha256sums=('SKIP')
+  "$pkgname::git+https://github.com/robert-dodier/maxima-jupyter.git"
+  "https://beta.quicklisp.org/quicklisp.lisp"
+  "load.lisp")
+sha256sums=('SKIP'
+            '4a7a5c2aebe0716417047854267397e24a44d0cce096127411e9ce9ccfeb2c17'
+            'e7063f56f8308a9cc728f1f51964a4f0bcc762b6ffe69b8c57c6b021e2fafe73')
 
 pkgver() {
   cd $pkgname
@@ -17,26 +21,9 @@ pkgver() {
 }
 
 package() {
-  cd $pkgname
-  install -Dm644 load-maxima-jupyter.lisp "$pkgdir/usr/share/maxima-jupyter/load-maxima-jupyter.lisp"
-  install -Dm644 src/additions.lisp "$pkgdir/usr/share/maxima-jupyter/src/additions.lisp"
-  install -Dm644 src/config.lisp "$pkgdir/usr/share/maxima-jupyter/src/config.lisp"
-  install -Dm644 src/evaluator.lisp "$pkgdir/usr/share/maxima-jupyter/src/evaluator.lisp"
-  install -Dm644 src/heartbeat.lisp "$pkgdir/usr/share/maxima-jupyter/src/heartbeat.lisp"
-  install -Dm644 src/iopub.lisp "$pkgdir/usr/share/maxima-jupyter/src/iopub.lisp"
-  install -Dm644 src/kernel.lisp "$pkgdir/usr/share/maxima-jupyter/src/kernel.lisp"
-  install -Dm644 src/maxima-jupyter.asd "$pkgdir/usr/share/maxima-jupyter/src/maxima-jupyter.asd"
-  install -Dm644 src/message.lisp "$pkgdir/usr/share/maxima-jupyter/src/message.lisp"
-  install -Dm644 src/overrides-cl-info.lisp "$pkgdir/usr/share/maxima-jupyter/src/overrides-cl-info.lisp"
-  install -Dm644 src/overrides.lisp "$pkgdir/usr/share/maxima-jupyter/src/overrides.lisp"
-  install -Dm644 src/packages.lisp "$pkgdir/usr/share/maxima-jupyter/src/packages.lisp"
-  install -Dm644 src/results.lisp "$pkgdir/usr/share/maxima-jupyter/src/results.lisp"
-  install -Dm644 src/shell.lisp "$pkgdir/usr/share/maxima-jupyter/src/shell.lisp"
-  install -Dm644 src/stdin.lisp "$pkgdir/usr/share/maxima-jupyter/src/stdin.lisp"
-  install -Dm644 src/utils.lisp "$pkgdir/usr/share/maxima-jupyter/src/utils.lisp"
-  install -Dm644 -d "$pkdir/usr/share/jupyter/kernels/maxima"
-  python install-maxima-jupyter.py --root /usr/share/maxima-jupyter \
-    --maxima /usr/bin/maxima --prefix "$pkgdir/usr"
-  chmod 644 "$pkdir/usr/share/jupyter/kernels/maxima/kernel.json"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  tmpdir=$(mktemp -d -t $pkgname-XXXXXXXXXX)
+  HOME=$tmpdir maxima --preload-lisp=load.lisp --batch-string="jupyter_system_install(false,\"$pkgdir\");"
+  rm $pkgdir/usr/share/maxima-jupyter/bundle-info.sexp
+  install -Dm644 $pkgname/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -rf $tmpdir
 }
diff --git a/load.lisp b/load.lisp
new file mode 100644
index 000000000000..4841ef3e4c69
--- /dev/null
+++ b/load.lisp
@@ -0,0 +1,5 @@
+(load "quicklisp.lisp")
+
+(quicklisp-quickstart:install)
+
+(load "maxima-jupyter-git/load-maxima-jupyter.lisp")