From bcc2eb631a780a4776db1b444209850de0f2d1ac Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 21 Jul 2022 23:54:57 +0200 Subject: [PATCH 1/6] 5.0.0 --- conf/app.src | 2 +- manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index a3220c0..5f14b3b 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,4 +1,4 @@ -SOURCE_URL=https://releases.rocket.chat/4.8.2/download +SOURCE_URL=https://releases.rocket.chat/5.0.0/download SOURCE_SUM=40ccc61c5dd7fb129f6816476203d8cbe3f804d5d172ea60420df6a344f90376 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz diff --git a/manifest.json b/manifest.json index 4a5ca3b..f29d40e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Team collaboration communication platform", "fr": "Plateforme de communication collaborative en équipe" }, - "version": "4.8.2~ynh1", + "version": "5.0.0~ynh1", "url": "https://rocket.chat", "upstream": { "license": "GPL-3.0", From 43bb33dddc81cc487392f7e0bbcf24925209bd48 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 21 Jul 2022 21:55:07 +0000 Subject: [PATCH 2/6] 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 49b8fae..2228441 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Rocket.Chat is an open-source fully customizable communications platform develop - Mobile Apps for [iOS](https://apps.apple.com/app/rocket-chat/id1148741252) and [Android](https://play.google.com/store/apps/details?id=chat.rocket.android) - Desktop Apps for [macOS](https://apps.apple.com/br/app/rocket-chat/id1086818840), [Linux](https://snapcraft.io/rocketchat-desktop) and [Windows](https://releases.rocket.chat/desktop/latest/download) -**Shipped version:** 4.8.2~ynh1 +**Shipped version:** 5.0.0~ynh1 **Demo:** https://cloud.rocket.chat/trial diff --git a/README_fr.md b/README_fr.md index 6b39a2e..19eac9d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ Rocket.Chat est une plate-forme de communication open source entièrement person - Applications mobiles pour [iOS](https://apps.apple.com/app/rocket-chat/id1148741252) et [Android](https://play.google.com/store/apps/details?id=chat.rocket.android) - Applications de bureau pour [macOS](https://apps.apple.com/br/app/rocket-chat/id1086818840), [Linux](https://snapcraft.io/rocketchat-desktop) et [Windows](https://releases.rocket.chat/desktop/latest/download) -**Version incluse :** 4.8.2~ynh1 +**Version incluse :** 5.0.0~ynh1 **Démo :** https://cloud.rocket.chat/trial From 223295f5efd47e0edbbbc3f39d6caf9e67a398cb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 22 Jul 2022 00:01:58 +0200 Subject: [PATCH 3/6] Update app.src --- conf/app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/app.src b/conf/app.src index 5f14b3b..cd3b68e 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ SOURCE_URL=https://releases.rocket.chat/5.0.0/download -SOURCE_SUM=40ccc61c5dd7fb129f6816476203d8cbe3f804d5d172ea60420df6a344f90376 +SOURCE_SUM=5acd6cb786e19c6feceef2897860052dc002d0288e561987ff6334fe9198de5b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From 95f2d2b78000e0512f3ae93548e48275d29f4088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 26 Jul 2022 21:05:19 +0200 Subject: [PATCH 4/6] fix mongo version --- scripts/_common.sh | 4 ++-- scripts/upgrade | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index ce634ac..8170e19 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,11 +6,11 @@ nodejs_version=14 +mongo_version=5.0 + # dependencies used by the app pkg_dependencies="apt-transport-https build-essential gzip curl fontconfig graphicsmagick" -YNH_MONGO_VERSION=4.4 - #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 4ebd4e3..ea52458 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,11 +25,11 @@ port=$(ynh_app_setting_get --app=$app --key=port) password=$(ynh_app_setting_get --app=$app --key=password) admin=$(ynh_app_setting_get --app=$app --key=admin) email=$(ynh_app_setting_get --app=$app --key=email) +mongo_version=$(ynh_app_setting_get --app=$app --key=mongo_version) #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) @@ -75,6 +75,12 @@ if ynh_legacy_permissions_exists; then ynh_app_setting_delete --app=$app --key=is_public fi +# If mongo_version doesn't exist, create it +if [ -z "$mongo_version" ]; then + mongo_version="$(mongod --version | grep -oP 'db version v\K.{0,3}')" + ynh_app_setting_set --app=$app --key=mongo_version --value=$mongo_version +fi + #================================================= # CREATE DEDICATED USER #================================================= @@ -107,7 +113,7 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=7 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version -ynh_exec_warn_less ynh_install_mongo +ynh_exec_warn_less ynh_install_mongo --mongo_version=$mongo_version ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" #================================================= From af5e535390dab076bc74da51bbd6897bc0088f47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 26 Jul 2022 21:08:00 +0200 Subject: [PATCH 5/6] Fix --- scripts/install | 2 +- scripts/restore | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index eac10b7..c2e34c4 100644 --- a/scripts/install +++ b/scripts/install @@ -79,7 +79,7 @@ ynh_script_progression --message="Installing dependencies..." --weight=20 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version -ynh_exec_warn_less ynh_install_mongo +ynh_exec_warn_less ynh_install_mongo --mongo_version=$mongo_version ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" #================================================= diff --git a/scripts/restore b/scripts/restore index c8df5a2..b4f28d8 100644 --- a/scripts/restore +++ b/scripts/restore @@ -32,6 +32,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name +mongo_version=$(ynh_app_setting_get --app=$app --key=mongo_version) #================================================= # CHECK IF THE APP CAN BE RESTORED @@ -72,7 +73,7 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=1 # Define and install dependencies ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version -ynh_exec_warn_less ynh_install_mongo +ynh_exec_warn_less ynh_install_mongo --mongo_version=$mongo_version ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" #================================================= From 73223feb2c25950a1952508d26632125efb3cb74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 26 Jul 2022 23:28:43 +0200 Subject: [PATCH 6/6] Update app.src --- conf/app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/app.src b/conf/app.src index cd3b68e..a8b5527 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ SOURCE_URL=https://releases.rocket.chat/5.0.0/download -SOURCE_SUM=5acd6cb786e19c6feceef2897860052dc002d0288e561987ff6334fe9198de5b +SOURCE_SUM=2622a5501d0ad46d0b943bad6385f4aecab7b3333ae48d028c42863545901d9c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true