From f468e33809e84f99edf1985331710d7755d8952e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 14 Feb 2023 21:24:21 +0100 Subject: [PATCH] Testing (#111) * Fix linter warnings * Update README.md * Update README.md delete App website (it's down) brought link in line 26 and 30 up to date with link to new place of documentation * Change version * Update links * Finding an available port * Add more_set_headers to NGINX conf * Silencing PostgreSQL warnings * Update nginx.conf * Update nginx.conf * Make `/embed/` links work properly (#8) Gives them the right headers and redirects them to the right place * Update manifest.json * fix * Update restore * Update install * Fix * Update install * Fix * Update install * Fix * Fix * Update check_process * Fix embeds again (#12) * Fix embeds again * Remove extra repo (#14) * Remove extra repo * Update manifest.json * Cleaning up * Patch * Fix * Fix * Fix * Update manifest.json * Update upgrade * Fix * Preserve config file and protect it * Fix permissions * Fix * Fix * fix * Update README.md (#28) .yml iso .yaml file * Fix * Update install * [autopatch] Update issue and PR templates (#32) Co-authored-by: Yunohost-Bot <> * [autopatch] Update issue and PR templates (#33) Co-authored-by: Yunohost-Bot <> * Fix * Fix * Update install * Auto-update README * Update install * Fix * Update _common.sh * Fix * Auto-update README * Fix * Fix * Create change_url * Fix * Update nginx.conf * Update check_process * Auto-update README * Auto-update README * upgrade crystal * Auto-update README * Update restore * Update upgrade * Update upgrade * Revert "Update upgrade" This reverts commit f533eb02cb99848aadab99afeb3ee5134073fab4. * Update upgrade * Update check_process * Add limitations * Auto-update README * New config file (#44) * Add config * Update check_process * From git commit (#46) * from commit * Fix doc link * Auto-update README * Update upgrade * Update config.yml * Update manifest.json * Auto-update README * Version bump (#54) * upgrade * Update restore * Add description * Auto-update README * config.yml may not exist during upgrade (#58) * Update systemd.service * Update manifest.json * Update manifest.json * Auto-update README * Reorder * Update _common.sh * Fix * Update Crystal (#63) * Update Crystal * Update install * Fix * Update _common.sh * Update _common.sh * 4.3 * Auto-update README * Upgrade * Auto-update README * Config panel (#72) * Add config panel * Update _common.sh * Fix * Auto-update README * upgrade to upstream * Auto-update README * Update _common.sh * Update manifest.json * Auto-update README * Update _common.sh * Update manifest.json * Auto-update README * Bugfix #77 by replace "shards" command (#79) * Bugfix #77 by "shards install" with "--production" See: https://github.com/iv-org/invidious/issues/2918#issuecomment-1048146335 * Upgrade to upstream * Auto-update README * Update check_process * 22.03.03 * Auto-update README * Add admin (#74) * Add admin * add email * Auto-update README * Fix * Update upgrade * Update _common.sh * Update _common.sh * Update manifest.json * Auto-update README * Fix * Update install * Fix * Fix * Auto-update README * Update upgrade * Revert "Update upgrade" This reverts commit a1dce069b4968f00bbaa59bc09ac0ecc9a37fcdb. * upgrade to upstream * Auto-update README * Upgrade to upstream * Auto-update README * upgrade to upstream * Auto-update README * Update _common.sh * Auto-update README * Upgrade to upstream * Auto-update README * upgrade * Auto-update README * Update _common.sh * Update manifest.json * Auto-update README * Auto-update README * Auto-update README * Upgrade to upstream * Auto-update README * Upgrade to upstream * Revert "Upgrade to upstream" This reverts commit dc91a2696e197755cfa6a002350f59c9f850db6a. * Update _common.sh * Update manifest.json * Auto-update README * Upgrade to upstream * Auto-update README * upgrade to upstream * Auto-update README * Upgrade to upstream * Auto-update README * Upgrade to upstream * Auto-update README * Upgrade * Auto-update README * Upgrade to upstream * Auto-update README * Auto-update README * Upgrade to upstream * Auto-update README * Fix * Auto-update README * Fix * Update to upstream * Auto-update README * Update install * Update install * Update install * Auto-update README * Update install * Update install * Update install * Update install * Update install * Update install * Update install * Update install * upgrade to upstream * Auto-update README * Update upgrade --------- Co-authored-by: deckname <58575263+deckname@users.noreply.github.com> Co-authored-by: Alexandre Aubin Co-authored-by: Georgelemental Co-authored-by: Jules-Bertholet Co-authored-by: clavelc <25869334+clavelc@users.noreply.github.com> Co-authored-by: YunoHost Bot Co-authored-by: Yunohost-Bot <> Co-authored-by: Jens Diemer Co-authored-by: yunohost-bot Co-authored-by: yalh76 --- README.md | 3 ++- README_fr.md | 3 ++- manifest.json | 2 +- scripts/_common.sh | 2 +- scripts/install | 9 +++++++-- scripts/upgrade | 11 +++++++---- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 8dba83b..a58f66d 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # Invidious for YunoHost [![Integration level](https://dash.yunohost.org/integration/invidious.svg)](https://dash.yunohost.org/appci/app/invidious) ![Working status](https://ci-apps.yunohost.org/ci/badges/invidious.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/invidious.maintain.svg) + [![Install Invidious with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=invidious) *[Lire ce readme en français.](./README_fr.md)* @@ -23,7 +24,7 @@ In addition to constituting an advantage in terms of confidentiality (the data d - Ability to subscribe to channels without creating a Google account -**Shipped version:** 23.01.29~ynh1 +**Shipped version:** 23.02.14~ynh1 **Demo:** https://invidious.site/ diff --git a/README_fr.md b/README_fr.md index 662578c..2565cfa 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # Invidious pour YunoHost [![Niveau d’intégration](https://dash.yunohost.org/integration/invidious.svg)](https://dash.yunohost.org/appci/app/invidious) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/invidious.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/invidious.maintain.svg) + [![Installer Invidious avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=invidious) *[Read this readme in english.](./README.md)* @@ -22,7 +23,7 @@ En plus de constituer un avantage sur le plan de la confidentialité (les donné - Possibilité d'afficher les commentaires Reddit plutôt que les commentaires YouTube, - Possibilité de s'abonner aux chaines sans créer de compte Google -**Version incluse :** 23.01.29~ynh1 +**Version incluse :** 23.02.14~ynh1 **Démo :** https://invidious.site/ diff --git a/manifest.json b/manifest.json index e6fce2d..d008375 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Alternative front-end to YouTube", "fr": "Front-end alternatif à YouTube" }, - "version": "23.01.29~ynh1", + "version": "23.02.14~ynh1", "url": "https://invidio.us/", "upstream": { "license": "GPL-3.0-only", diff --git a/scripts/_common.sh b/scripts/_common.sh index 6fce13b..ffdbf1d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -version_commit=3b8e6c6040fe341fe4b9fc16cdbd3aea697dfad3 +version_commit=7993784701686c057b85c57704537135e6326de9 # dependencies used by the app pkg_dependencies="apt-transport-https libssl-dev libxml2-dev libyaml-dev libgmp-dev libreadline-dev postgresql librsvg2-bin imagemagick libsqlite3-dev zlib1g-dev libevent-dev pkg-config libpcre3-dev" diff --git a/scripts/install b/scripts/install index c45ebb1..6e42f4c 100644 --- a/scripts/install +++ b/scripts/install @@ -107,11 +107,16 @@ ynh_script_progression --message="Setting up source files..." --weight=4 ynh_app_setting_set --app=$app --key=final_path --value=$final_path +mkdir -p "$final_path" +chown -R $app:www-data "$final_path" + +git config --system --add safe.directory $final_path + # Download, check integrity, uncompress and patch the source from GitHub -git clone https://github.com/iv-org/invidious "$final_path" --quiet +ynh_exec_as $app git clone https://github.com/iv-org/invidious "$final_path" --quiet pushd "$final_path" - git reset --hard --quiet $version_commit + ynh_exec_as $app git reset --hard --quiet $version_commit popd for i in $final_path/config/sql/*.sql ; do diff --git a/scripts/upgrade b/scripts/upgrade index 83f78e2..b3c4107 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -113,10 +113,13 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 pushd $final_path - git fetch - #git checkout master - git reset --hard --quiet $version_commit - git pull + chown -R $app:www-data "$final_path" + git config --system --add safe.directory $final_path + + ynh_exec_as $app git fetch + #git checkout master + ynh_exec_as $app git reset --hard --quiet $version_commit + ynh_exec_as $app git pull ynh_exec_warn_less shards install --production ynh_exec_warn_less crystal build $final_path/src/invidious.cr --release popd