Commit 0c295eb8 authored by Mark Evenson's avatar Mark Evenson

Fix install procedure for jars built via spigotmc

parent e6ef512a
......@@ -6,7 +6,7 @@
(defvar *swank-server-started-p* nil)
(unless *swank-server-started-p*
(setf swank::*loopback-interface* "0.0.0.0") ;; N.b SECURITY promiscuously bind to all interfaces
(setf swank::*loopback-interface* "0.0.0.0") ;; N.b SECURITY This promiscuously binds to all interfaces
(swank:create-server :port *swank-port* :dont-close t)
(setq *swank-server-started* t))
......
......@@ -60,36 +60,33 @@
(asdf:find-component system :jar-dependencies)
"craftbukkit-1.13.2"))
(p (asdf/interface:component-pathname
jar-component)))
(values
(unless (probe-file p)
(spigotmc-buildtools)
(uiop/stream:copy-file
(make-pathname :defaults (var/)
:name (pathname-name p)
:type (pathname-type p))
p))
(ensure-eula (var/))))))
jar-component))
(built-jar (make-pathname :defaults (var/)
:name (pathname-name p)
:type (pathname-type p))))
(unless (probe-file p)
(unless (probe-file built-jar)
(spigotmc-buildtools))
(uiop/stream:copy-file built-jar p)))))
(defun ensure-dependencies/spigot ()
(let* ((system (asdf:find-system :mycroft/spigot.jar/1/13/2))
(root (asdf/interface:component-pathname system)))
(#"setProperty" 'System "user.dir"
(namestring root))
(let* ((jar-component (asdf:find-component
(asdf:find-component system :jar-dependencies)
"craftbukkit-1.13.2"))
(p (asdf/interface:component-pathname
jar-component)))
(values
(unless (probe-file p)
(spigotmc-buildtools)
(uiop/stream:copy-file
(make-pathname :defaults (var/)
:name (pathname-name p)
:type (pathname-type p))
p))
(ensure-eula (var/))))))
(let* ((jar-component
(asdf:find-component (asdf:find-component system :jar-dependencies)
"craftbukkit-1.13.2"))
(p
(asdf/interface:component-pathname jar-component))
(built-jar
(make-pathname :defaults (var/)
:name (pathname-name p)
:type (pathname-type p))))
(unless (probe-file p)
(unless (probe-file built-jar)
(spigotmc-buildtools))
(uiop/stream:copy-file built-jar p)))))
(defun ensure-eula (root)
(let ((eula (merge-pathnames "eula.txt" root)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment