diff --git a/config_panel.toml b/config_panel.toml index eaebfb3..b9ad4bc 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -30,7 +30,7 @@ services = ["__APP__", "__APP___workers"] ask.en = "Change weather provider" ask.fr = "Changer le fournisseur météo" type = "select" - choices = ["", "darksky", "visualcrossing"] + choices = ["", "visualcrossing"] default = "visualcrossing" help.en = "Change your weather provider by choosing one of the proposed ones" help.fr = "Changer votre fournisseur météo en choisissant un de ceux qui vous sont proposés" diff --git a/manifest.toml b/manifest.toml index 09a82a4..92b41b1 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.14~ynh3" +version = "0.7.15~ynh1" maintainers = ["Thovi98"] @@ -17,7 +17,7 @@ admindoc = "https://samr1.github.io/FitTrackee" code = "https://github.com/SamR1/FitTrackee" [integration] -yunohost = ">= 11.1.13" +yunohost = ">= 11.1.17" architectures = "all" multi_instance = true ldap = false @@ -43,10 +43,10 @@ ram.runtime = "50M" [install.weather_provider] ask.en = "(Optional) Choose your weather provider between Darksky and Visual Crossing" ask.fr = "(Optionnel) Choisissez votre fournisseur météo entre Darksky et Visual Crossing" - help.en = "As Darksky is deprecating his api, it is suggested to opt for Visual Crossing" - help.fr = "Comme Darksky déprécie son API, il est suggéré d'opter pour Visual Crossing" + help.en = "Since Fittrackee 0.7.15, only Visual Crossing is supported" + help.fr = "Depuis Fittrackee 0.7.15, seul Visual Crossing est supporté" type = "select" - choices = ["", "darksky", "visualcrossing"] + choices = ["", "visualcrossing"] default = "visualcrossing" optional = true diff --git a/scripts/install b/scripts/install index b35751d..6b66c73 100755 --- a/scripts/install +++ b/scripts/install @@ -9,7 +9,9 @@ source _common.sh source /usr/share/yunohost/helpers -admin_mail=$(ynh_user_get_info --username=$admin --key=username) +admin=$(ynh_user_get_info --username=$admin --key="username") +admin_mail=$(ynh_user_get_info --username="$admin" --key="mail") +admin_password=$(ynh_user_get_info --username="$admin" --key="password") #================================================= # LOGROTATE @@ -68,6 +70,10 @@ popd ynh_exec_warn_less $install_dir/.venv/bin/ftcli db upgrade +ynh_exec_warn_less $install_dir/.venv/bin/ftcli users create $admin --email $admin_mail --password $admin_password + +ynh_exec_warn_less $install_dir/.venv/bin/ftcli users update $admin --set-admin true + #================================================= # System Configuration #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 2b0e323..8797ffe 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -42,7 +42,7 @@ chown -R $app: "$install_dir" pushd $install_dir mkdir -p .venv - PIPENV_VENV_IN_PROJECT="enabled" PIPENV_SKIP_LOCK=true ynh_exec_warn_less python3 -m pipenv install fittrackee==$fittrackee_version python-dotenv + PIPENV_VENV_IN_PROJECT="enabled" PIPENV_SKIP_LOCK=true ynh_exec_warn_less python3 -m pipenv install -U fittrackee==$fittrackee_version python-dotenv popd #================================================= diff --git a/tests.toml b/tests.toml index 6445f91..a6ac7bc 100644 --- a/tests.toml +++ b/tests.toml @@ -15,4 +15,5 @@ test_format = 1.0 # ------------------------------- # Commits to test upgrade from # ------------------------------- - + + test_upgrade_from.852bf0d.name = "Upgrade from 0.7.14"