diff --git a/manifest.toml b/manifest.toml index 19e7dfc..392677e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "TLDraw" description.en = "Tiny little drawing app" description.fr = "Petite application de dessin" -version = "1.24.5~ynh3" +version = "2.3.0~ynh1" maintainers = ["Raoul de Limezy"] @@ -51,11 +51,11 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/tldraw/tldraw/archive/8e55e263bf45cb6d425178c638aec385ec01e62c.zip" - sha256 = "d090aac97266e043418ec34d46e722dd69c7dace4bd30f39afb9478eb21271d1" + url = "https://github.com/tldraw/tldraw/archive/refs/tags/v2.3.0.tar.gz" + sha256 = "7f66ab29a755ad085695730690b6be1337c08a727eff687163990d4ecca696d6" # Disabled autoupdate for now because it's flooding with PRs which are failing the test # The "multiplayer" patch needs to be fixed to be adapted to newer versions - #autoupdate.strategy = "latest_github_tag" + autoupdate.strategy = "latest_github_tag" [resources.ports] diff --git a/scripts/_common.sh b/scripts/_common.sh index e6ea462..3cbba5a 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,12 +1,10 @@ #!/bin/bash -#================================================= -# COMMON VARIABLES #================================================= # PHP APP SPECIFIC #================================================= -NODEJS_VERSION=18 +NODEJS_VERSION=20 #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index e30d975..c22456a 100755 --- a/scripts/install +++ b/scripts/install @@ -1,7 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -12,49 +10,29 @@ source /usr/share/yunohost/helpers #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Installing dependencies..." --weight=1 +ynh_script_progression --message="Installing NodeJS..." --weight=1 # Install nodejs -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$NODEJS_VERSION +ynh_install_nodejs --nodejs_version=$NODEJS_VERSION #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression --message="Setting up source files..." --weight=1 -ynh_setup_source --dest_dir="$install_dir" +ynh_setup_source --dest_dir="$install_dir/sources" chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" - -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config +chown -R "$app:www-data" "$install_dir" #================================================= # ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Patching multiplayer file..." --weight=1 +# ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_secure_remove --file="$install_dir/packages/tldraw/src/components/TopPanel/MultiplayerMenu/MultiplayerMenu.tsx" -ynh_add_config --template="../conf/MultiplayerMenu.tsx" --destination="$install_dir/packages/tldraw/src/components/TopPanel/MultiplayerMenu/MultiplayerMenu.tsx" - -chmod 400 "$install_dir/packages/tldraw/src/components/TopPanel/MultiplayerMenu/MultiplayerMenu.tsx" -chown $app:$app "$install_dir/packages/tldraw/src/components/TopPanel/MultiplayerMenu/MultiplayerMenu.tsx" - -#================================================= -# ADD A CONFIGURATION -#================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=1 - -ynh_add_config --template="../conf/.env" --destination="$install_dir/apps/www/.env" - -chmod 400 "$install_dir/apps/www/.env" -chown $app:$app "$install_dir/apps/www/.env" +# ynh_add_config --template=".env" --destination="$install_dir/apps/www/.env" +# chmod 400 "$install_dir/apps/www/.env" +# chown "$app:$app" "$install_dir/apps/www/.env" #================================================= # BUILD YARN DEPENDENCIES @@ -62,44 +40,34 @@ chown $app:$app "$install_dir/apps/www/.env" pushd "$install_dir" ynh_use_nodejs - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --network-timeout 1000000000 - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn build + ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" yarn cache clean + ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" yarn install --network-timeout 1000000000 + ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" yarn cache clean + ynh_exec_warn_less ynh_exec_as "$app" env "$ynh_node_load_PATH" yarn build popd #================================================= -# SETUP SYSTEMD +# SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring a systemd service..." --weight=1 +ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 + +# Create a dedicated NGINX config +ynh_add_nginx_config # Create a dedicated systemd config ynh_add_systemd_config - -#================================================= -# GENERIC FINALIZATION -#================================================= -# SETUP LOGROTATE -#================================================= -ynh_script_progression --message="Configuring log rotation..." --weight=1 +yunohost service add "$app" --description="A tiny little drawing app" --log="/var/log/$app/$app.log" # Use logrotate to manage application logfile(s) ynh_use_logrotate -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 - -yunohost service add $app --description="A tiny little drawing app" --log="/var/log/$app/$app.log" - #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=1 +ynh_script_progression --message="Starting $app's systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/$app.log" #================================================= # END OF SCRIPT