From ee8bce92e9567025585bec81cf0df935792bf85f Mon Sep 17 00:00:00 2001 From: anmol26s Date: Mon, 7 Dec 2020 17:40:39 +0530 Subject: [PATCH 1/3] updated to version 5.0.4 --- README.md | 2 +- check_process | 2 +- conf/app.src | 4 ++-- conf/app_addons.src | 4 ++-- manifest.json | 2 +- scripts/install | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index cc0dca21..a8fc5e0b 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview [Hubzilla](https://hub.libranet.de/directory?f=&global=1&pubforums=1) is a social networking platform built with control of your privacy at center stage. Your online communications can be as public as you wish or as private as you require. Private conversations, private photos, private videos. Your media isn't hidden behind an obscure URL which can be guessed, it is protected by state-of-the-art cross-domain authentication. What this all means for you: **less drama**. -**Shipped version:** 5.0.3 +**Shipped version:** 5.0.4 ## Screenshots diff --git a/check_process b/check_process index 1f307759..f346686e 100644 --- a/check_process +++ b/check_process @@ -16,7 +16,7 @@ setup_private=0 setup_public=1 upgrade=1 - upgrade=1 from_commit=fff29441b225ccf6bbae976db559478688185b2b + upgrade=1 from_commit=7bd8c1e8f82aff4ffe21a4b54bbc9ef9eec8eb60 backup_restore=1 multi_instance=1 incorrect_path=1 diff --git a/conf/app.src b/conf/app.src index 78713b38..975ebd6d 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://framagit.org/hubzilla/core/-/archive/5.0.3/core-5.0.3.tar.gz -SOURCE_SUM=17291772816b489fd6c524fa4db1c8da2138229fe4b668795d44f4c0bbe2bebe +SOURCE_URL=https://framagit.org/hubzilla/core/-/archive/5.0.4/core-5.0.4.tar.gz +SOURCE_SUM=4ab1af882ad73b92c394dc4fe8b280eb419928442ede1cc1e0da28122f86b7ea SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR= diff --git a/conf/app_addons.src b/conf/app_addons.src index 1528a068..20faf8a4 100644 --- a/conf/app_addons.src +++ b/conf/app_addons.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://framagit.org/hubzilla/addons/-/archive/5.0.3/addons-5.0.3.tar.gz -SOURCE_SUM=5c653e904cbe79cdb9b9a0e9db72ddae1f4c08fa0f80209e39c060e1a9bf2da4 +SOURCE_URL=https://framagit.org/hubzilla/addons/-/archive/5.0.4/addons-5.0.4.tar.gz +SOURCE_SUM=6e87010603c5f80b01356deffbada207f82d15202b87ed21ed6618724ee8f690 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR= diff --git a/manifest.json b/manifest.json index e80cf260..58338b50 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ }, "url": "https://zotlabs.org/page/hubzilla/hubzilla-project", "license": "MIT", - "version": "5.0.3~ynh1", + "version": "5.0.4~ynh1", "maintainer": { "name": "Anmol Sharma" }, diff --git a/scripts/install b/scripts/install index 98d1465d..48f80b71 100755 --- a/scripts/install +++ b/scripts/install @@ -27,7 +27,7 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url="/" admin=$YNH_APP_ARG_ADMIN -email=$(sudo yunohost user info $admin | grep "mail:" | cut -d' ' -f2) +email=$(yunohost user info $admin | grep "mail:" | cut -d' ' -f2) upload="256M" random_string="$(ynh_string_random)$(ynh_string_random)$(ynh_string_random)" database=`expr $YNH_APP_ARG_DATABASE` From e99c8caef5c7ad6a0671a2d650366cfefd99e0b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 7 Dec 2020 13:12:48 +0100 Subject: [PATCH 2/3] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index cc0dca21..8c89cd07 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # Hubzilla for YunoHost -[![Integration level](https://dash.yunohost.org/integration/hubzilla.svg)](https://dash.yunohost.org/appci/app/hubzilla) ![](https://ci-apps.yunohost.org/ci/badges/hubzilla.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/hubzilla.maintain.svg) - +[![Integration level](https://dash.yunohost.org/integration/hubzilla.svg)](https://dash.yunohost.org/appci/app/hubzilla) ![](https://ci-apps.yunohost.org/ci/badges/hubzilla.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/hubzilla.maintain.svg) [![Install Hubzilla with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=hubzilla) > *This package allow you to install Hubzilla quickly and simply on a YunoHost server. From e3be165a4ad948065c4d6b4e50eb8908c9130e93 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 7 Dec 2020 13:53:19 +0100 Subject: [PATCH 3/3] Fix linter --- README.md | 2 +- check_process | 3 --- manifest.json | 2 +- scripts/_common.sh | 2 +- scripts/install | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 8c89cd07..46a2b460 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview [Hubzilla](https://hub.libranet.de/directory?f=&global=1&pubforums=1) is a social networking platform built with control of your privacy at center stage. Your online communications can be as public as you wish or as private as you require. Private conversations, private photos, private videos. Your media isn't hidden behind an obscure URL which can be guessed, it is protected by state-of-the-art cross-domain authentication. What this all means for you: **less drama**. -**Shipped version:** 5.0.3 +**Shipped version:** 5.0.3 ## Screenshots diff --git a/check_process b/check_process index 1f307759..2a16e8c2 100644 --- a/check_process +++ b/check_process @@ -19,11 +19,8 @@ upgrade=1 from_commit=fff29441b225ccf6bbae976db559478688185b2b backup_restore=1 multi_instance=1 - incorrect_path=1 port_already_use=0 change_url=0 -;;; Levels - Level 5=auto ;;; Options Email=anmol@datamol.org Notification=change diff --git a/manifest.json b/manifest.json index e80cf260..64e918bf 100644 --- a/manifest.json +++ b/manifest.json @@ -19,7 +19,7 @@ "postgresql" ], "requirements": { - "yunohost": ">= 3.8.1" + "yunohost": ">= 4.0.0" }, "previous_maintainers": { "name": "Andrew Manning", diff --git a/scripts/_common.sh b/scripts/_common.sh index a39842c0..e754c527 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ # dependencies used by the app YNH_PHP_VERSION="7.3" -extra_php_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-gd" +extra_php_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-gd" # dependencies used by the app pkg_dependencies="postgresql postgresql-contrib" diff --git a/scripts/install b/scripts/install index 98d1465d..48f80b71 100755 --- a/scripts/install +++ b/scripts/install @@ -27,7 +27,7 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url="/" admin=$YNH_APP_ARG_ADMIN -email=$(sudo yunohost user info $admin | grep "mail:" | cut -d' ' -f2) +email=$(yunohost user info $admin | grep "mail:" | cut -d' ' -f2) upload="256M" random_string="$(ynh_string_random)$(ynh_string_random)$(ynh_string_random)" database=`expr $YNH_APP_ARG_DATABASE`