From ac44a5c3730092c37d15f06092a783786d153c40 Mon Sep 17 00:00:00 2001
From: Brian Seymour <imbrianseymour@gmail.com>
Date: Fri, 12 Mar 2021 14:41:43 -0600
Subject: [PATCH] new clojure install

---
 container/install_script.sh | 9 ++++-----
 lxc/executors/clojure       | 2 +-
 lxc/util/versions           | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/container/install_script.sh b/container/install_script.sh
index 3aaad05..b9682c6 100644
--- a/container/install_script.sh
+++ b/container/install_script.sh
@@ -17,7 +17,7 @@ apt-get install -y \
     nano wget build-essential pkg-config libxml2-dev \
     libsqlite3-dev mono-complete curl cmake libpython2.7-dev \
     ruby libtinfo-dev unzip git openssl libssl-dev sbcl libevent-dev \
-    ninja-build
+    ninja-build maven
 
 # install python2
 # final binary: /opt/python2/Python-2.7.17/python
@@ -315,10 +315,9 @@ source /opt/.profile
 # final binary: /opt/clojure/bin/clojure
 # get version: /opt/clojure/bin/clojure -version
 cd /opt && mkdir clojure && cd clojure
-curl -O https://download.clojure.org/install/linux-install-1.10.2.796.sh
-chmod +x linux-install-1.10.2.796.sh
-./linux-install-1.10.2.796.sh --prefix /opt/clojure
-echo 'export PATH=$PATH:/opt/clojure/bin' >> /opt/.profile
+git clone https://github.com/clojure/clojure.git
+cd clojure
+mvn -Plocal -Dmaven.test.skip=true package
 
 # create runnable users and apply limits
 for i in {1..150}; do
diff --git a/lxc/executors/clojure b/lxc/executors/clojure
index f82f9e8..03f475a 100644
--- a/lxc/executors/clojure
+++ b/lxc/executors/clojure
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 cd /tmp/$1
-timeout -s KILL 10 xargs -a args.args -d '\n' clojure -Sdeps '{:mvn/local-repo "/opt/.m2/repository"}' -M code.code < stdin.stdin
+timeout -s KILL 10 xargs -a args.args -d '\n' java -jar /opt/clojure/clojure/clojure.jar code.code < stdin.stdin
diff --git a/lxc/util/versions b/lxc/util/versions
index 49ec747..af068a0 100755
--- a/lxc/util/versions
+++ b/lxc/util/versions
@@ -22,7 +22,7 @@ lxc-attach --clear-env -n piston -- /bin/bash -l -c "g++ --version"
 echo '---'
 
 echo 'clojure'
-lxc-attach --clear-env -n piston -- /bin/bash -l -c "clojure -version"
+echo '1.10.2'
 echo '---'
 
 echo 'crystal'