From 50ed24b246abceb90865a0e44c2eb7866376df2f Mon Sep 17 00:00:00 2001 From: Miraty Date: Sat, 27 Aug 2022 02:51:58 +0200 Subject: [PATCH 1/4] Allow locales/ listing --- README.md | 4 +++- README_fr.md | 4 +++- manifest.json | 2 +- scripts/_common.sh | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 53cdb38..283a7e1 100755 --- a/README.md +++ b/README.md @@ -17,7 +17,8 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Web interface for generating QR codes -**Shipped version:** 2.0.0~ynh1 +**Shipped version:** 2.0.0~ynh2 + **Demo:** https://qr.antopie.org @@ -27,6 +28,7 @@ Web interface for generating QR codes ## Documentation and resources +* Official app website: * Upstream app code repository: * YunoHost documentation for this app: * Report a bug: diff --git a/README_fr.md b/README_fr.md index b35a7ff..5d703fb 100755 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Interface Web pour générer des codes QR -**Version incluse :** 2.0.0~ynh1 +**Version incluse :** 2.0.0~ynh2 + **Démo :** https://qr.antopie.org @@ -27,6 +28,7 @@ Interface Web pour générer des codes QR ## Documentations et ressources +* Site officiel de l'app : * Dépôt de code officiel de l'app : * Documentation YunoHost pour cette app : * Signaler un bug : diff --git a/manifest.json b/manifest.json index 4580d65..7b2ea55 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web interface for generating QR codes", "fr": "Interface Web pour générer des codes QR" }, - "version": "2.0.0~ynh1", + "version": "2.0.0~ynh2", "url": "https://code.antopie.org/miraty/libreqr", "upstream": { "license": "AGPL-3.0-or-later", diff --git a/scripts/_common.sh b/scripts/_common.sh index f56b2c6..2784020 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,7 +1,7 @@ libreqr_apply_filesystem_permissions() { find "$final_path" -type f -exec chmod 400 "{}" + find "$final_path" -type f -exec chown www-data:www-data "{}" + - find "$final_path" -type d -exec chmod 110 "{}" + + find "$final_path" -type d -exec chmod 510 "{}" + find "$final_path" -type d -exec chown $app:www-data "{}" + find "$final_path" -type f -name "*.php" -exec chmod 400 "{}" + find "$final_path" -type f -name "*.php" -exec chown $app:$app "{}" + From 8df24b266bf579acea18be2547a78e829e8d0afd Mon Sep 17 00:00:00 2001 From: Miraty Date: Sat, 27 Aug 2022 03:24:43 +0200 Subject: [PATCH 2/4] Add upgrade test in check_process --- check_process | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/check_process b/check_process index 3dd879e..41623c3 100644 --- a/check_process +++ b/check_process @@ -7,9 +7,12 @@ setup_public=1 upgrade=1 upgrade=1 from_commit=3b225b6a98f91493bdf3ae593a59cbdd3616106f + upgrade=1 from_commit=53600a0a5838d26d0d6989be4c461007a58b4bf0 backup_restore=1 multi_instance=1 change_url=1 ;;; Upgrade options ; commit=3b225b6a98f91493bdf3ae593a59cbdd3616106f - name=LibreQR 1.3.0 + name=1.3.0~ynh1 + ; commit=53600a0a5838d26d0d6989be4c461007a58b4bf0 + name=2.0.0~ynh1 From b85dd78fb9f499fb433eaf06200d49d09d634afa Mon Sep 17 00:00:00 2001 From: Miraty Date: Sat, 27 Aug 2022 04:13:54 +0200 Subject: [PATCH 3/4] Allow css/ listing --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 2784020..689c83f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,6 +9,6 @@ libreqr_apply_filesystem_permissions() { find "$final_path" -type f -name "*.css" -exec chown $app:www-data "{}" + find "$final_path" -type f -name "*.less" -exec chmod 440 "{}" + find "$final_path" -type f -name "*.less" -exec chown $app:www-data "{}" + - chmod 350 "$final_path"/css + chmod 550 "$final_path"/css chown $app:www-data "$final_path"/css } From 52fed194e70723d9acffbabb6a3e53f398d5dadb Mon Sep 17 00:00:00 2001 From: Miraty Date: Sat, 27 Aug 2022 04:52:52 +0200 Subject: [PATCH 4/4] Fix css/ permissions --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 689c83f..d74a579 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,6 +9,6 @@ libreqr_apply_filesystem_permissions() { find "$final_path" -type f -name "*.css" -exec chown $app:www-data "{}" + find "$final_path" -type f -name "*.less" -exec chmod 440 "{}" + find "$final_path" -type f -name "*.less" -exec chown $app:www-data "{}" + - chmod 550 "$final_path"/css + chmod 750 "$final_path"/css chown $app:www-data "$final_path"/css }