From 08a217cd98431bbbf5953754dbfe866a5b27fe5c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 10 Sep 2021 23:45:22 +0200 Subject: [PATCH 1/3] 1.4.4 --- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/upgrade | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index 8c16c58..063cbed 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/phpipam/phpipam/releases/download/v1.4.3/phpipam-v1.4.3.zip -SOURCE_SUM=f85b11399fc2fd3d3027e41bc7eecb89149454f3845fe1cda4c1e3722d16d00d +SOURCE_URL=https://github.com/phpipam/phpipam/releases/download/v1.4.4/phpipam-v1.4.4.zip +SOURCE_SUM=0baa77f135bbf72b138c58e50d58046eaaad722a96f09d3e148b61c5cd5f071f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 86f126b..c197287 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web IP address management application", "fr": "Application web de gestion d'adresses IP" }, - "version": "1.4.3~ynh1", + "version": "1.4.4~ynh1", "url": "https://phpipam.net/", "upstream": { "license": "GPL-3.0-only", diff --git a/scripts/upgrade b/scripts/upgrade index 2de2b21..5cd3849 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -103,7 +103,7 @@ ynh_script_progression --message="Updating a configuration file..." --weight=1 ynh_add_config --template="../conf/config.dist.php" --destination="$final_path/config.php" chmod 400 "$final_path/config.php" -chown $app:$app "$final_path/config.php" +chown $app: "$final_path/config.php" #================================================= # GENERIC FINALIZATION From ee24da1df72d31d10839fc5d9a74af99c60521ee Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 10 Sep 2021 21:45:28 +0000 Subject: [PATCH 2/3] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2d4e8cd..3efdd78 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Web IP address management application -**Shipped version:** 1.4.3~ynh1 +**Shipped version:** 1.4.4~ynh1 **Demo:** http://demo.phpipam.net diff --git a/README_fr.md b/README_fr.md index a9191a3..05676a5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Application web de gestion d'adresses IP -**Version incluse :** 1.4.3~ynh1 +**Version incluse :** 1.4.4~ynh1 **Démo :** http://demo.phpipam.net From f78c9e1dd2488082cb273121164e199ba0055ed3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 10 Sep 2021 23:47:36 +0200 Subject: [PATCH 3/3] Fix --- scripts/install | 6 +----- scripts/restore | 2 -- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index 8a3726d..9426dee 100644 --- a/scripts/install +++ b/scripts/install @@ -13,10 +13,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -105,7 +101,7 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1 ynh_add_config --template="../conf/config.dist.php" --destination="$final_path/config.php" chmod 644 "$final_path/config.php" -chown $app:$app "$final_path/config.php" +chown $app: "$final_path/config.php" #================================================= # GENERIC FINALIZATION diff --git a/scripts/restore b/scripts/restore index 321537e..d3cddcf 100644 --- a/scripts/restore +++ b/scripts/restore @@ -40,8 +40,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path "