From 619ce069d7909c17a504e7fa93452238dcd55edd Mon Sep 17 00:00:00 2001 From: Navan Chauhan Date: Wed, 20 Jul 2022 17:49:20 -0600 Subject: [PATCH 1/8] fix #13 --- scripts/install | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/install b/scripts/install index c38439b..ed2eeef 100755 --- a/scripts/install +++ b/scripts/install @@ -100,6 +100,11 @@ chmod 750 "$datadir" chmod -R o-rwx "$datadir" chown -R $app:www-data "$datadir" +# Run migrate for new install go-shiori/shiori#447 +pushd $final_path/ + sudo -u $app final_path/shiori serve --port $port --webroot $path_url +popd + #================================================= # SETUP SYSTEMD #================================================= From eb4b8fa4a2de5b2d142937ee676ef350b6e7f513 Mon Sep 17 00:00:00 2001 From: navanchauhan Date: Wed, 20 Jul 2022 17:50:24 -0600 Subject: [PATCH 2/8] bump version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 060d52c..c2480f9 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Simple bookmark manager", "fr": "Gestionnaire de liens simple" }, - "version": "1.5.3~ynh1", + "version": "1.5.3~ynh2", "url": "https://github.com/go-shiori/shiori", "upstream": { "license": "MIT", From cab8985e9ae2ed50bbf7a7ae77b1dcbdcf14a1d7 Mon Sep 17 00:00:00 2001 From: navanchauhan Date: Wed, 20 Jul 2022 17:55:10 -0600 Subject: [PATCH 3/8] dumb mistake --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index ed2eeef..d528060 100755 --- a/scripts/install +++ b/scripts/install @@ -102,7 +102,7 @@ chown -R $app:www-data "$datadir" # Run migrate for new install go-shiori/shiori#447 pushd $final_path/ - sudo -u $app final_path/shiori serve --port $port --webroot $path_url + sudo -u $app $final_path/shiori serve --port $port --webroot $path_url popd #================================================= From 41fd9f8b772f3a3c6d8becab11b2fe59c0189218 Mon Sep 17 00:00:00 2001 From: navanchauhan Date: Wed, 20 Jul 2022 17:58:59 -0600 Subject: [PATCH 4/8] fix command --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index d528060..18d178d 100755 --- a/scripts/install +++ b/scripts/install @@ -102,7 +102,7 @@ chown -R $app:www-data "$datadir" # Run migrate for new install go-shiori/shiori#447 pushd $final_path/ - sudo -u $app $final_path/shiori serve --port $port --webroot $path_url + sudo -u $app $final_path/shiori migrate popd #================================================= From 2d92472992e6f63c601a9af6c1bc07d9af2f5f68 Mon Sep 17 00:00:00 2001 From: navanchauhan Date: Wed, 20 Jul 2022 18:14:43 -0600 Subject: [PATCH 5/8] fix migration --- scripts/install | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 18d178d..d20a4e4 100755 --- a/scripts/install +++ b/scripts/install @@ -102,7 +102,9 @@ chown -R $app:www-data "$datadir" # Run migrate for new install go-shiori/shiori#447 pushd $final_path/ - sudo -u $app $final_path/shiori migrate + sudo -u $app $final_path/shiori --portable migrate + sudo -u $app mv shiori-data/shiori.db $datadir + rm -r shiori-date popd #================================================= From 94c3ead9296a2c7871afc1b1b03789cad2bc73eb Mon Sep 17 00:00:00 2001 From: navanchauhan Date: Wed, 20 Jul 2022 18:16:11 -0600 Subject: [PATCH 6/8] fix typo --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index d20a4e4..6665fa8 100755 --- a/scripts/install +++ b/scripts/install @@ -104,7 +104,7 @@ chown -R $app:www-data "$datadir" pushd $final_path/ sudo -u $app $final_path/shiori --portable migrate sudo -u $app mv shiori-data/shiori.db $datadir - rm -r shiori-date + rm -r shiori-data popd #================================================= From 1807fc5f4c0a73379a4d60cb3750f4957bf8468d Mon Sep 17 00:00:00 2001 From: navanchauhan Date: Wed, 20 Jul 2022 18:40:11 -0600 Subject: [PATCH 7/8] use helpers --- scripts/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 6665fa8..4ed7ed5 100755 --- a/scripts/install +++ b/scripts/install @@ -102,9 +102,9 @@ chown -R $app:www-data "$datadir" # Run migrate for new install go-shiori/shiori#447 pushd $final_path/ - sudo -u $app $final_path/shiori --portable migrate - sudo -u $app mv shiori-data/shiori.db $datadir - rm -r shiori-data + ynh_exec_as $app $final_path/shiori --portable migrate + ynh_exec_as $app mv shiori-data/shiori.db $datadir + ynh_secure_remove --file=$final_path/shiori-data popd #================================================= From 305341b82081a7b178f6125deb43ce75e55f520a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 23 Jul 2022 05:33:03 +0000 Subject: [PATCH 8/8] 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 603d6b9..f49117b 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Shiori is a simple bookmarks manager written in Go language. Intended as a simpl [Shiori Web Extension](https://github.com/go-shiori/shiori-web-ext) is a simple extension for managing bookmarks using Shiori. This extension is intended to integrate Shiori with your favorite web browser. This way, you can save and remove bookmarks in Shiori without switching from your current page. -**Shipped version:** 1.5.3~ynh1 +**Shipped version:** 1.5.3~ynh2 **Demo:** https://demo.example.com diff --git a/README_fr.md b/README_fr.md index 79483a9..bfdaa6f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Shiori is a simple bookmarks manager written in Go language. Intended as a simpl [Shiori Web Extension](https://github.com/go-shiori/shiori-web-ext) is a simple extension for managing bookmarks using Shiori. This extension is intended to integrate Shiori with your favorite web browser. This way, you can save and remove bookmarks in Shiori without switching from your current page. -**Version incluse :** 1.5.3~ynh1 +**Version incluse :** 1.5.3~ynh2 **Démo :** https://demo.example.com