diff --git a/scripts/install b/scripts/install index c4cea10..b82298b 100755 --- a/scripts/install +++ b/scripts/install @@ -49,9 +49,23 @@ 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 + ynh_exec_warn_less pip install --upgrade pip ynh_exec_warn_less pip install fittrackee==$fittrackee_version toml pyyaml popd diff --git a/scripts/upgrade b/scripts/upgrade index 0098afd..4cfe6f1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -60,9 +60,26 @@ 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 + +sudo -u "$app" env PATH=$PATH rustup install stable +sudo -u "$app" env PATH=$PATH rustup default stable + +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 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"