From ff9d2b547f7e430a024efb78f2d444d07ea4168d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Sun, 31 Oct 2021 13:09:00 +0100
Subject: [PATCH] Fix building rust crates via separate user

---
 playbook.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/playbook.yml b/playbook.yml
index 0a63e58..05c3d63 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -394,13 +394,21 @@
           system: true
         become: true
 
+      - name: install rustup on ubuntu
+        shell: curl https://sh.rustup.rs -sSf | sh -s -- -y
+        args:
+          creates: /var/lib/rust_build/.cargo/bin/rustup
+        become: true
+        become_user: rust_build
+        when: distro == 'ubuntu'
+
       - name: add rustup stable toolchain
-        command: rustup default stable
+        shell: . ~/.cargo/env && rustup default stable
         become: true
         become_user: rust_build
 
       - name: update rustup stable toolchain
-        command: rustup update stable
+        shell: . ~/.cargo/env && rustup update stable
         become: true
         become_user: rust_build
 
@@ -428,6 +436,8 @@
 
       - name: build rust crates
         shell: |
+          set -o errexit
+          . ~/.cargo/env
           cargo install --version {{ item.version }} {{ item.crate }}
           mv /var/lib/rust_build/.cargo/bin/{{ item. binary }} /var/lib/rust_build/.cargo/bin/{{ item.binary }}.{{ item.version }}
         args: