From 67e77b1f4e5db15acd295b965072e9425217bc0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 1 Apr 2021 21:48:42 +0200 Subject: [PATCH] Upgrade to 4.5 --- conf/{armv7_stretch.src => armv7_bullseye.src} | 0 manifest.json | 2 +- scripts/_common.sh | 11 ++++++++++- 3 files changed, 11 insertions(+), 2 deletions(-) rename conf/{armv7_stretch.src => armv7_bullseye.src} (100%) diff --git a/conf/armv7_stretch.src b/conf/armv7_bullseye.src similarity index 100% rename from conf/armv7_stretch.src rename to conf/armv7_bullseye.src diff --git a/manifest.json b/manifest.json index befd89e..a1e8cfa 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "josue@tille.ch" }, "requirements": { - "yunohost": ">= 3.8.0.0" + "yunohost": ">= 4.0.0.0" }, "multi_instance": false, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 59afd95..cc8c7fe 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ app=$YNH_APP_INSTANCE_NAME final_path=/opt/yunohost/$app pgadmin_user="$app" python_version="$(python3 -V | cut -d' ' -f2 | cut -d. -f1-2)" -dependances="python3-pip build-essential python3-dev python3-venv postgresql uwsgi uwsgi-plugin-python3 expect libpq-dev" +dependances="python3-pip build-essential python3-dev python3-venv postgresql uwsgi uwsgi-plugin-python3 expect libpq-dev libkrb5-dev" #================================================= # DEFINE ALL COMMON FONCTIONS @@ -36,6 +36,15 @@ install_source() { ynh_secure_remove --file=$final_path/share ynh_setup_source --dest_dir $final_path/ --source_id "armv7_$(lsb_release --codename --short)" else + # Install rustup is not already installed + # We need this to be able to install cryptgraphy + export PATH="$PATH:$final_path/.cargo/bin:$final_path/.local/bin:/usr/local/sbin" + if [ -e $final_path/.rustup ]; then + sudo -u "$synapse_user" env PATH=$PATH rustup update + else + sudo -u "$synapse_user" bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain=stable' + fi + # Install virtualenv if it don't exist test -e $final_path/bin/python3 || python3 -m venv $final_path