From 54c378364b2dfaab4f082c3ed57379cb4e60484a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 14 Dec 2023 08:52:43 +0100 Subject: [PATCH 1/5] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index ad78a92..234471e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "PairDrop" description.en = "Local file sharing in your browser" description.fr = "Partage de fichiers locaux dans votre navigateur" -version = "1.9.4~ynh1" +version = "1.10.1~ynh1" maintainers = ["eric_G"] @@ -45,8 +45,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/schlagmichdoch/PairDrop/archive/refs/tags/v1.9.4.tar.gz" - sha256 = "c1078812d313025f281dd4415d3530359daa2726ec6aff3ba37d36c3217936be" + url = "https://github.com/schlagmichdoch/PairDrop/archive/refs/tags/v1.10.1.tar.gz" + sha256 = "b24b2cdca07ce18c5c828b84be87832a601d59525136a67067e714c53424ab68" autoupdate.strategy = "latest_github_tag" [resources.system_user] From f7d3fdf067d2a0deca76df8ca2ef581da5e53a74 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 14 Dec 2023 07:52:48 +0000 Subject: [PATCH 2/5] 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 ce5df7b..b8b8d3e 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ PairDrop is a sublime alternative to AirDrop that works on all platforms. - As it is web based, it runs on all devices. -**Shipped version:** 1.9.4~ynh1 +**Shipped version:** 1.10.1~ynh1 **Demo:** https://pairdrop.net/ diff --git a/README_fr.md b/README_fr.md index ef16739..7df44ab 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ PairDrop est une sublime alternative à AirDrop qui fonctionne sur toutes les pl - Application Web - Comme il est basé sur le Web, il fonctionne sur tous les appareils. -**Version incluse :** 1.9.4~ynh1 +**Version incluse :** 1.10.1~ynh1 **Démo :** https://pairdrop.net/ From dcc690ab740e0f522682dd00a2a1aacd4a2146a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 14 Dec 2023 10:07:27 +0100 Subject: [PATCH 3/5] Update systemd.service --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index 8a3d618..d3f1576 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -10,7 +10,7 @@ Environment="__YNH_NODE_LOAD_PATH__" Environment="PORT=__PORT__" Environment="RTC_CONFIG=__INSTALL_DIR__/rtc_config.json" WorkingDirectory=__INSTALL_DIR__/ -ExecStart=__YNH_NODE__ __INSTALL_DIR__/index.js --rate-limit --auto-restart +ExecStart=__YNH_NODE__ start --rate-limit --auto-restart Restart=always From 6ef9de765fdb0972cc56c140446425f19826d633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 14 Dec 2023 10:21:25 +0100 Subject: [PATCH 4/5] Update systemd.service --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index d3f1576..a529491 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -10,7 +10,7 @@ Environment="__YNH_NODE_LOAD_PATH__" Environment="PORT=__PORT__" Environment="RTC_CONFIG=__INSTALL_DIR__/rtc_config.json" WorkingDirectory=__INSTALL_DIR__/ -ExecStart=__YNH_NODE__ start --rate-limit --auto-restart +ExecStart=__YNH_NODE__ __INSTALL_DIR__/server/index.js --rate-limit --auto-restart Restart=always From c0947d471692ad18bca7e9bdedc8661229ebe12c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 14 Dec 2023 10:30:55 +0100 Subject: [PATCH 5/5] cleaning --- scripts/backup | 1 - scripts/install | 6 +----- scripts/remove | 4 ---- scripts/restore | 2 -- scripts/upgrade | 14 -------------- 5 files changed, 1 insertion(+), 26 deletions(-) diff --git a/scripts/backup b/scripts/backup index f8e82aa..efbeed3 100755 --- a/scripts/backup +++ b/scripts/backup @@ -6,7 +6,6 @@ # IMPORT GENERIC HELPERS #================================================= -# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers diff --git a/scripts/install b/scripts/install index 8bea240..97f14b3 100755 --- a/scripts/install +++ b/scripts/install @@ -14,7 +14,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Installing dependencies..." --weight=7 -# Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= @@ -24,7 +23,6 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= ynh_script_progression --message="Setting up source files..." --weight=1 -# Download, check integrity, uncompress and patch the source from manifest.toml ynh_setup_source --dest_dir="$install_dir" chown -R $app:www-data "$install_dir" @@ -34,10 +32,8 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 -# Create a dedicated NGINX config using the conf/nginx.conf template ynh_add_nginx_config -# Create a dedicated systemd config ynh_add_systemd_config yunohost service add $app --description="Local file sharing in your browser" --log="/var/log/$app/$app.log" @@ -59,7 +55,7 @@ popd #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/rtc_config.json" --destination="$install_dir/rtc_config.json" +ynh_add_config --template="rtc_config.json" --destination="$install_dir/rtc_config.json" chmod 400 "$install_dir/rtc_config.json" chown $app:$app "$install_dir/rtc_config.json" diff --git a/scripts/remove b/scripts/remove index 59b1cc0..777c9ee 100755 --- a/scripts/remove +++ b/scripts/remove @@ -16,9 +16,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 -# This should be a symetric version of what happens in the install script - -# Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null then ynh_script_progression --message="Removing $app service integration..." --weight=1 @@ -29,7 +26,6 @@ ynh_remove_systemd_config ynh_remove_nginx_config -# Remove NodeJS ynh_remove_nodejs #================================================= diff --git a/scripts/restore b/scripts/restore index 7b915f0..634eade 100755 --- a/scripts/restore +++ b/scripts/restore @@ -15,7 +15,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Reinstalling dependencies..." --weight=7 -# Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= @@ -48,7 +47,6 @@ yunohost service add $app --description="Local file sharing in your browser" --l #================================================= ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1 -# Typically you only have either $app or php-fpm but not both at the same time... ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 26052c5..ef71625 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -28,7 +28,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=1 - # Download, check integrity, uncompress and patch the source from manifest.toml ynh_setup_source --dest_dir="$install_dir" fi @@ -39,7 +38,6 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Upgrading dependencies..." --weight=5 -# Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= @@ -63,18 +61,6 @@ pushd "$install_dir" ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install popd -#================================================= -# RECONFIGURE THE APP (UPDATE CONF, APPLY MIGRATIONS...) -#================================================= -# UPDATE A CONFIG FILE -#================================================= -#ynh_script_progression --message="Updating a configuration file..." --weight=1 - -#ynh_add_config --template="some_config_file" --destination="$install_dir/some_config_file" - -#chmod 400 "$install_dir/some_config_file" -#chown $app:$app "$install_dir/some_config_file" - #================================================= # START SYSTEMD SERVICE #=================================================