From 24ad74084c0d5d40829ce1184180627612189ad0 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Thu, 24 Aug 2023 13:53:14 +0200
Subject: [PATCH 01/10] test

---
 scripts/install | 13 +++++++++++++
 scripts/upgrade | 12 ++++++++++++
 tests.toml      |  2 --
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index c4cea10..d6c00a8 100755
--- a/scripts/install
+++ b/scripts/install
@@ -49,6 +49,19 @@ set -a; source "$install_dir/.env"; set +a
 #=================================================
 ynh_script_progression --message="Installing Python dependencies..." --weight=3
 
+if [ $YNH_ARCH == "armhf" ] || [ $YNH_ARCH == "armel" ]
+then
+# Install rustup is not already installed 
+# We need this to be able to install cryptgraphy on ARM hardware
+export PATH="$PATH:$install_dir/.cargo/bin:$install_dir/.local/bin:/usr/local/sbin"
+    if [ -e $install_dir/.rustup ]; then
+    sudo -u "$app" env PATH=$PATH rustup update
+    else
+    sudo -u "$app" bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain=stable --profile=minimal'
+    fi
+fi
+
+
 pushd $install_dir
 	python3 -m venv $install_dir/venv
 	source $install_dir/venv/bin/activate
diff --git a/scripts/upgrade b/scripts/upgrade
index 0098afd..d8d24b3 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -60,6 +60,18 @@ ynh_script_progression --message="Installing Python dependencies..." --weight=3
 
 ynh_secure_remove $install_dir/.venv
 
+if [ $YNH_ARCH == "armhf" ] || [ $YNH_ARCH == "armel" ]
+then
+# Install rustup is not already installed 
+# We need this to be able to install cryptgraphy on ARM hardware
+export PATH="$PATH:$install_dir/.cargo/bin:$install_dir/.local/bin:/usr/local/sbin"
+    if [ -e $install_dir/.rustup ]; then
+    sudo -u "$app" env PATH=$PATH rustup update
+    else
+    sudo -u "$app" bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain=stable --profile=minimal'
+    fi
+fi
+
 pushd $install_dir
 	python3 -m venv $install_dir/venv
 	source $install_dir/venv/bin/activate
diff --git a/tests.toml b/tests.toml
index 34f7a3c..99f274e 100644
--- a/tests.toml
+++ b/tests.toml
@@ -16,7 +16,5 @@ test_format = 1.0
     # Commits to test upgrade from
     # -------------------------------
     
-    test_upgrade_from.852bf0d.name = "0.7.14"
-    test_upgrade_from.0b20803.name = "0.7.17"
     test_upgrade_from.ca02214.name = "0.7.18"
     test_upgrade_from.9c094f9.name = "0.7.21"

From a65085675b993426e3503af5dc0e0fd632e113a2 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Fri, 25 Aug 2023 11:31:21 +0200
Subject: [PATCH 02/10] Update install

---
 scripts/install | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/install b/scripts/install
index d6c00a8..9ad2cfb 100755
--- a/scripts/install
+++ b/scripts/install
@@ -65,6 +65,7 @@ fi
 pushd $install_dir
 	python3 -m venv $install_dir/venv
 	source $install_dir/venv/bin/activate
+        ynh_exec_warn_less pip install --upgrade pip
 	ynh_exec_warn_less pip install fittrackee==$fittrackee_version toml pyyaml
 popd
 

From cc48f9272949c68a85c6c582d253218e64bc8642 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Fri, 25 Aug 2023 11:31:49 +0200
Subject: [PATCH 03/10] Update upgrade

---
 scripts/upgrade | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index d8d24b3..efc360c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -75,6 +75,7 @@ fi
 pushd $install_dir
 	python3 -m venv $install_dir/venv
 	source $install_dir/venv/bin/activate
+        ynh_exec_warn_less pip install --upgrade pip
 	ynh_exec_warn_less pip install fittrackee==$fittrackee_version toml pyyaml
 popd
 

From cd24f5930e234edd29298eb1ad2e3365019ed78e Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Fri, 25 Aug 2023 11:57:48 +0200
Subject: [PATCH 04/10] Update upgrade

---
 scripts/upgrade | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index efc360c..260f13c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -72,6 +72,9 @@ export PATH="$PATH:$install_dir/.cargo/bin:$install_dir/.local/bin:/usr/local/sb
     fi
 fi
 
+rustup install stable
+rustup default stable
+
 pushd $install_dir
 	python3 -m venv $install_dir/venv
 	source $install_dir/venv/bin/activate

From d8843e4bc5c7dc79f6ab855380d1980d933081b0 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Fri, 25 Aug 2023 11:58:09 +0200
Subject: [PATCH 05/10] Update install

---
 scripts/install | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/install b/scripts/install
index 9ad2cfb..6b576df 100755
--- a/scripts/install
+++ b/scripts/install
@@ -61,6 +61,8 @@ export PATH="$PATH:$install_dir/.cargo/bin:$install_dir/.local/bin:/usr/local/sb
     fi
 fi
 
+rustup install stable
+rustup default stable
 
 pushd $install_dir
 	python3 -m venv $install_dir/venv

From 7252b9ca2ad86c1944078d868f7b8988f79afa94 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Fri, 25 Aug 2023 11:58:51 +0200
Subject: [PATCH 06/10] Update install

---
 scripts/install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 6b576df..9e99b25 100755
--- a/scripts/install
+++ b/scripts/install
@@ -59,11 +59,12 @@ export PATH="$PATH:$install_dir/.cargo/bin:$install_dir/.local/bin:/usr/local/sb
     else
     sudo -u "$app" bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain=stable --profile=minimal'
     fi
-fi
 
 rustup install stable
 rustup default stable
 
+fi
+
 pushd $install_dir
 	python3 -m venv $install_dir/venv
 	source $install_dir/venv/bin/activate

From 184bc73c8055d73af67e72a01bd0f9d889be18ff Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Fri, 25 Aug 2023 11:59:19 +0200
Subject: [PATCH 07/10] Update upgrade

---
 scripts/upgrade | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 260f13c..6bde7c4 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -70,11 +70,12 @@ export PATH="$PATH:$install_dir/.cargo/bin:$install_dir/.local/bin:/usr/local/sb
     else
     sudo -u "$app" bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain=stable --profile=minimal'
     fi
-fi
 
 rustup install stable
 rustup default stable
 
+fi
+
 pushd $install_dir
 	python3 -m venv $install_dir/venv
 	source $install_dir/venv/bin/activate

From a37f67702bc3737b8a2194b4932132a42de9f8ef Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Fri, 25 Aug 2023 12:12:41 +0200
Subject: [PATCH 08/10] Update upgrade

---
 scripts/upgrade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 6bde7c4..4cfe6f1 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -71,8 +71,8 @@ export PATH="$PATH:$install_dir/.cargo/bin:$install_dir/.local/bin:/usr/local/sb
     sudo -u "$app" bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain=stable --profile=minimal'
     fi
 
-rustup install stable
-rustup default stable
+sudo -u "$app" env PATH=$PATH rustup install stable
+sudo -u "$app" env PATH=$PATH rustup default stable
 
 fi
 

From f3ca60721e1dad63bd02540312465d8b8e364304 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Fri, 25 Aug 2023 12:14:05 +0200
Subject: [PATCH 09/10] Update install

---
 scripts/install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 9e99b25..d075269 100755
--- a/scripts/install
+++ b/scripts/install
@@ -60,8 +60,8 @@ export PATH="$PATH:$install_dir/.cargo/bin:$install_dir/.local/bin:/usr/local/sb
     sudo -u "$app" bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain=stable --profile=minimal'
     fi
 
-rustup install stable
-rustup default stable
+sudo -u "$app" env PATH=$PATH rustup install stable
+sudo -u "$app" env PATH=$PATH rustup default stable
 
 fi
 

From dc08ce18afa4b7c1462833b63127107716cbca76 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Sat, 26 Aug 2023 17:24:44 +0200
Subject: [PATCH 10/10] Update install

---
 scripts/install | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index d075269..b82298b 100755
--- a/scripts/install
+++ b/scripts/install
@@ -60,9 +60,6 @@ export PATH="$PATH:$install_dir/.cargo/bin:$install_dir/.local/bin:/usr/local/sb
     sudo -u "$app" bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain=stable --profile=minimal'
     fi
 
-sudo -u "$app" env PATH=$PATH rustup install stable
-sudo -u "$app" env PATH=$PATH rustup default stable
-
 fi
 
 pushd $install_dir