diff --git a/README.md b/README.md index 28a09e9..d30cec0 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ FitTrackee allows you to track your outdoor activities (workouts) from gpx files No mobile app has been developed yet, but several existing mobile apps can store workouts data locally and export them into a gpx file. -**Shipped version:** 0.7.21~ynh1 +**Shipped version:** 0.7.22~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 66de0db..d232bb8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po FitTrackee vous permet de suivre vos activités de plein air (séances d'entraînement) à partir de fichiers gpx et de conserver vos données sur votre propre serveur. Aucune application mobile n'a encore été développée, mais plusieurs applications mobiles existantes peuvent stocker localement les données des séances d'entraînement et les exporter dans un fichier gpx. -**Version incluse :** 0.7.21~ynh1 +**Version incluse :** 0.7.22~ynh1 ## Captures d’écran diff --git a/manifest.toml b/manifest.toml index e124f82..9d3a986 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "FitTrackee" description.en = "Self-hosted outdoor activity tracker 🚴" description.fr = "Traqueur d’activités extérieures auto-hébergé 🚴" -version = "0.7.21~ynh1" +version = "0.7.22~ynh1" maintainers = ["Thovi98"] @@ -14,23 +14,22 @@ license = "AGPL-3.0" website = "https://samr1.github.io/FitTrackee" demo = "" admindoc = "https://samr1.github.io/FitTrackee" -code = "https://github.com/SamR1/FitTrackee" +code = "https://github.com/SamR1/FitTrackee" [integration] -yunohost = ">= 11.1.17" -architectures = "all" +yunohost = ">= 11.2" +architectures = "all" multi_instance = true ldap = false -sso = false -disk = "50M" -ram.build = "50M" -ram.runtime = "50M" +sso = false +disk = "50M" +ram.build = "50M" +ram.runtime = "50M" [install] [install.domain] # this is a generic question - ask strings are automatically handled by Yunohost's core type = "domain" - full_domain = true [install.init_main_permission] type = "group" diff --git a/scripts/_common.sh b/scripts/_common.sh index 687fbb0..25a0b39 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -fittrackee_version="0.7.21" +fittrackee_version="0.7.22" #================================================= # PERSONAL HELPERS 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 9995b8e..99f274e 100644 --- a/tests.toml +++ b/tests.toml @@ -16,6 +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"