From 7a1ec283d2e4128c98550680f96cf8f829798c39 Mon Sep 17 00:00:00 2001
From: openoms <oms@tuta.io>
Date: Sun, 10 Oct 2021 10:54:49 +0100
Subject: [PATCH] cl-plugin.http: fix rust installation #2579

---
 home.admin/config.scripts/cl-plugin.http.sh | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/home.admin/config.scripts/cl-plugin.http.sh b/home.admin/config.scripts/cl-plugin.http.sh
index 7b9ca07d2..100c4a59b 100644
--- a/home.admin/config.scripts/cl-plugin.http.sh
+++ b/home.admin/config.scripts/cl-plugin.http.sh
@@ -82,15 +82,10 @@ fi
 
 if [ "$1" = "on" ];then
     
-  if [ $(cargo -V 2>/dev/null | grep -c cargo) -eq 0 ];then
-      echo
-      echo "# Installing Rust"
-      echo
-      # https://github.com/romanz/electrs/blob/master/doc/usage.md#build-dependencies
-      #sudo -u electrs curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sudo -u electrs sh -s -- --default-toolchain 1.39.0 -y
-      sudo apt update
-      sudo apt install -y cargo
-  fi
+  echo
+  echo "# Installing Rust for the bitcoin user"
+  echo
+  sudo -u bitcoin curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sudo -u bitcoin sh -s -- -y
 
   if [ ! -f /home/bitcoin/cl-plugins-available/c-lightning-http-plugin ];then
     sudo -u bitcoin mkdir /home/bitcoin/cl-plugins-available
@@ -102,7 +97,7 @@ if [ "$1" = "on" ];then
     echo "# change CL REST port to 9080"
     sudo sed -i "s/8080/9080/g" src/rpc.rs
     echo
-    sudo -u bitcoin cargo build --release
+    sudo -u bitcoin /home/bitcoin/.cargo/bin/cargo build --release
     sudo chmod a+x /home/bitcoin/cl-plugins-available/c-lightning-http-plugin/target/release/c-lightning-http-plugin
   fi