From a3aeca9525deef51dcbdbef7ec6d5da44d9cb03a Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Fri, 22 Nov 2019 12:06:48 +0100
Subject: [PATCH] Update `xargo`.

---
 docker/xargo.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/docker/xargo.sh b/docker/xargo.sh
index 56a3ec7de..94a8a6271 100755
--- a/docker/xargo.sh
+++ b/docker/xargo.sh
@@ -3,9 +3,6 @@
 set -ex
 
 main() {
-    local tag=v0.3.5
-    local target=x86_64-unknown-linux-gnu
-
     local dependencies=(
         ca-certificates
         curl
@@ -20,8 +17,16 @@ main() {
         fi
     done
 
-    curl -LSfs http://japaric.github.io/trust/install.sh | \
-    sh -s -- --git japaric/xargo --tag $tag --target $target --to /usr/bin && \
+    export RUSTUP_HOME=/tmp/rustup
+    export CARGO_HOME=/tmp/cargo
+
+    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o rustup-init.sh
+    sh rustup-init.sh -y --no-modify-path
+    rm rustup-init.sh
+
+    PATH="${CARGO_HOME}/bin:${PATH}" cargo install xargo --root /usr
+
+    rm -r "${RUSTUP_HOME}" "${CARGO_HOME}"
 
     apt-get purge --auto-remove -y ${purge_list[@]}
     rm $0