From 3e9611621bb85274d2bcb173b6598865ad8ebd7f Mon Sep 17 00:00:00 2001 From: ewilly Date: Sun, 16 Jul 2023 21:10:29 +0200 Subject: [PATCH 1/6] Fix #8 --- conf/systemd-scrutiny-collector.service | 2 +- conf/systemd-scrutiny-web-server.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/systemd-scrutiny-collector.service b/conf/systemd-scrutiny-collector.service index d8c36b1..db34191 100644 --- a/conf/systemd-scrutiny-collector.service +++ b/conf/systemd-scrutiny-collector.service @@ -10,7 +10,7 @@ Group=root WorkingDirectory=__INSTALL_DIR__ LogsDirectory=__APP__ StateDirectory=__APP__ -ExecStart=__INSTALL_DIR__/bin/scrutiny-collector-metrics-linux-amd64 run --config __INSTALL_DIR__/config/collector.yaml +ExecStart=__INSTALL_DIR__/bin/scrutiny-collector-metrics-linux-__YNH_ARCH__ run --config __INSTALL_DIR__/config/collector.yaml Restart=no StandardOutput=append:/var/log/__APP__/collector.log StandardError=inherit diff --git a/conf/systemd-scrutiny-web-server.service b/conf/systemd-scrutiny-web-server.service index 413ed19..b55ac88 100644 --- a/conf/systemd-scrutiny-web-server.service +++ b/conf/systemd-scrutiny-web-server.service @@ -9,7 +9,7 @@ Group=__APP__ WorkingDirectory=__INSTALL_DIR__ LogsDirectory=__APP__ StateDirectory=__APP__ -ExecStart=__INSTALL_DIR__/bin/scrutiny-web-linux-amd64 start --config __INSTALL_DIR__/config/scrutiny.yaml +ExecStart=__INSTALL_DIR__/bin/scrutiny-web-linux-__YNH_ARCH__ start --config __INSTALL_DIR__/config/scrutiny.yaml Restart=always RestartSec=10s StandardOutput=append:/var/log/__APP__/web-server.log From e497d63298a953b614e5c4c5d0b05479688929e1 Mon Sep 17 00:00:00 2001 From: ewilly Date: Sun, 16 Jul 2023 21:12:31 +0200 Subject: [PATCH 2/6] Update ynh version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 540fcad..3b452ea 100644 --- a/manifest.toml +++ b/manifest.toml @@ -4,7 +4,7 @@ id = "scrutiny" name = "Scrutiny" description.en = "WebUI for smartd S.M.A.R.T monitoring" -version = "0.7.1~ynh1" +version = "0.7.1~ynh2" maintainers = ["ewilly"] From 4cbcc9a655d85e42922df7a1293fa49b2d11b0cd Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 16 Jul 2023 19:12:39 +0000 Subject: [PATCH 3/6] 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 2fc8577..e2e4f41 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Scrutiny is a simple but focused application, with a couple of core features: - (Future) Hard Drive performance testing & tracking -**Shipped version:** 0.7.1~ynh1 +**Shipped version:** 0.7.1~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index d7ccc70..acc6a93 100644 --- a/README_fr.md +++ b/README_fr.md @@ -35,7 +35,7 @@ Scrutiny is a simple but focused application, with a couple of core features: - (Future) Hard Drive performance testing & tracking -**Version incluse :** 0.7.1~ynh1 +**Version incluse :** 0.7.1~ynh2 ## Captures d’écran From 3e8302d57285d36fec19ac2d156e9590fa23ef45 Mon Sep 17 00:00:00 2001 From: ewilly Date: Sun, 16 Jul 2023 21:18:44 +0200 Subject: [PATCH 4/6] Fix #8 --- scripts/_common.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/_common.sh b/scripts/_common.sh index a08bed0..b67da64 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -3,6 +3,7 @@ #================================================= # COMMON VARIABLES #================================================= +$ynh_arch=$YNH_ARCH #================================================= # PERSONAL HELPERS From 8577549ef5b8693eeddce452550bc74ec67620cd Mon Sep 17 00:00:00 2001 From: ewilly Date: Sun, 16 Jul 2023 21:24:32 +0200 Subject: [PATCH 5/6] Fix #8 --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index b67da64..1fa01c7 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -3,7 +3,7 @@ #================================================= # COMMON VARIABLES #================================================= -$ynh_arch=$YNH_ARCH +$ynh_arch="$YNH_ARCH" #================================================= # PERSONAL HELPERS From 49dfe5a02b39a9f74b2fb4b97de85c6e858b7e94 Mon Sep 17 00:00:00 2001 From: ewilly Date: Sun, 16 Jul 2023 21:27:53 +0200 Subject: [PATCH 6/6] Fix #8 --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 1fa01c7..dec9475 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -3,7 +3,7 @@ #================================================= # COMMON VARIABLES #================================================= -$ynh_arch="$YNH_ARCH" +ynh_arch="$YNH_ARCH" #================================================= # PERSONAL HELPERS