From c449a31b37242d42d53033aca7efb38cfb94d057 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Thu, 30 Jan 2020 21:24:36 -0600
Subject: [PATCH] Removed the need for xq

---
 Dockerfile         | 5 +++--
 start-deployFabric | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a4516d8a..93892e1a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,8 +18,6 @@ RUN apk add --no-cache -U \
   nano \
   python python-dev py2-pip
 
-RUN pip install yq
-
 HEALTHCHECK --start-period=1m CMD mc-monitor status --host localhost --port $SERVER_PORT
 
 RUN addgroup -g 1000 minecraft \
@@ -47,6 +45,9 @@ RUN easy-add --file mc-monitor --from https://github.com/itzg/mc-monitor/release
 ARG MC_RUN_VER=1.3.3
 RUN easy-add --file mc-server-runner --from https://github.com/itzg/mc-server-runner/releases/download/${MC_RUN_VER}/mc-server-runner_${MC_RUN_VER}_linux_${ARCH}.tar.gz
 
+ARG MVN_META_REL_VER=0.1.0
+RUN easy-add --file maven-metadata-release --from https://github.com/itzg/maven-metadata-release/releases/download/v${MVN_META_REL_VER}/maven-metadata-release_${MVN_META_REL_VER}_linux_${ARCH}.tar.gz
+
 COPY mcadmin.jq /usr/share
 COPY mcstatus /usr/local/bin
 
diff --git a/start-deployFabric b/start-deployFabric
index 13ace55b..ad6e1d7b 100644
--- a/start-deployFabric
+++ b/start-deployFabric
@@ -12,8 +12,7 @@ if [[ -z $FABRIC_INSTALLER && -z $FABRIC_INSTALLER_URL ]]; then
   echo "Checking Fabric version information."
   case $FABRICVERSION in
     LATEST)
-      curl -fsSL https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml | xq -c . > /tmp/fabric.json
-      FABRIC_VERSION=$(< /tmp/fabric.json jq -r ".metadata.versioning.release")
+      FABRIC_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml)
       ;;
 
     *)