From 28ac465a754fb86068c39bb5d11bea5080108e67 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 25 Jan 2021 18:28:28 +0100 Subject: [PATCH] Fix --- conf/app.src | 8 ++++---- scripts/_common.sh | 8 ++------ scripts/install | 13 ++++--------- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/conf/app.src b/conf/app.src index 062b930..509a579 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/RocketChat/Rocket.Chat/archive/3.4.3.tar.gz -SOURCE_SUM=b586b1a3ad0ca22ed563fa9339058b481548544c4a9719fb955044496b65a418 +SOURCE_URL=https://github.com/RocketChat/Rocket.Chat/archive/3.10.4.zip +SOURCE_SUM=7edb0af029d205eeeeca741f9aff7879842df90624b9aa1d11921a46a18f7757 SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz +SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=Rocket.Chat-3.4.3.tar.gz +SOURCE_FILENAME= SOURCE_EXTRACT=true \ No newline at end of file diff --git a/scripts/_common.sh b/scripts/_common.sh index 1799b2e..3432457 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,14 +7,10 @@ # dependencies used by the app #pkg_dependencies="apt-transport-https build-essential gzip curl graphicsmagick" dirmngr -nodejs_version=12 +nodejs_version=14 # dependencies used by the app -pkg_dependencies="mongodb mongodb-server mongo-tools apt-transport-https build-essential gzip curl graphicsmagick " -pkg_dependencies_buster="mongodb-org mongodb-org-server mongodb-org-tools" - -mongodb_stretch="mongodb" -mongodb_buster="mongod" +pkg_dependencies="mongod mongodb-org mongodb-org-server mongodb-org-tools apt-transport-https build-essential gzip curl graphicsmagick" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 0871f02..e354749 100644 --- a/scripts/install +++ b/scripts/install @@ -75,13 +75,9 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version # Install Yarn #ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" -if [ "$(lsb_release --codename --short)" = "buster" ]; then - ynh_install_extra_app_dependencies --repo="deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.2 main" --package="$pkg_dependencies_buster" --key="https://www.mongodb.org/static/pgp/server-4.2.asc" +ynh_install_extra_app_dependencies --repo="deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.2 main" --package="mongod mongodb-org mongodb-org-server mongodb-org-tools" --key="https://www.mongodb.org/static/pgp/server-4.2.asc" mongodb_servicename=$mongodb_buster -else - ynh_install_app_dependencies $pkg_dependencies - mongodb_servicename=$mongodb_stretch -fi + #================================================= # CREATE A MONGODB DATABASE @@ -136,7 +132,6 @@ curl https://install.meteor.com/ | sh sudo -u $app meteor build --server-only --directory $final_path cd $final_path/bundle/programs/server ynh_npm install - popd || ynh_die #================================================= @@ -166,7 +161,7 @@ ynh_replace_string --match_string="replication:/replication:\n" --replace_strin ynh_script_progression --message="Securing files and directories..." # Set permissions to app files -chown -R $app:$app $final_path +chown -R $app: $final_path #================================================= # INTEGRATE SERVICE IN YUNOHOST @@ -195,7 +190,7 @@ ynh_script_progression --message="Configuring SSOwat..." --weight=1 # Make app public if necessary or protect it if [ $is_public -eq 1 ] then - ynh_permission_update --permission "main" --add "visitors" + ynh_permission_update --permission="main" --add="visitors" fi #=================================================