commit:     78af812b2fdb11750d7546b948923d7612dbb37c
Author:     Alexander Weber <web.alexander <AT> web <DOT> de>
AuthorDate: Fri Feb 16 08:27:04 2024 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Fri Feb 16 08:27:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=78af812b

gui-apps/ReGreet: fix openrc dirs, sample file path and elog output

Signed-off-by: Alexander Weber <web.alexander <AT> web.de>

 gui-apps/ReGreet/ReGreet-0.1.1-r4.ebuild | 31 +++++++++++++++----------------
 gui-apps/ReGreet/ReGreet-9999.ebuild     | 31 +++++++++++++++----------------
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/gui-apps/ReGreet/ReGreet-0.1.1-r4.ebuild 
b/gui-apps/ReGreet/ReGreet-0.1.1-r4.ebuild
index d423f19a1b..580e87dd64 100644
--- a/gui-apps/ReGreet/ReGreet-0.1.1-r4.ebuild
+++ b/gui-apps/ReGreet/ReGreet-0.1.1-r4.ebuild
@@ -273,31 +273,30 @@ src_install() {
        if use systemd; then
                insinto /etc/tmpfiles.d/ && newins 
"${WORKDIR}/${P}/systemd-tmpfiles.conf" regreet.conf
        elif use openrc; then
-               dodir /var/log/regreet
-               fowners greeter:greeter /var/log/regreet
+               keepdir /var/log/regreet
+               fowners greetd:greetd /var/log/regreet
                fperms 0755 /var/log/regreet
 
-               dodir /var/cache/regreet
-               fowners greeter:greeter /var/cache/regreet
+               keepdir /var/cache/regreet
+               fowners greetd:greetd /var/cache/regreet
                fperms 0755 /var/cache/regreet
        fi
        # Install ReGreet template config file as a doc
-       docinto /usr/share/doc/regreet
        dodoc "${WORKDIR}/${P}/regreet.sample.toml"
 
-       elog "ReGreet sample config file available on: 
/usr/share/regreet/regreet.sample.toml\n"
-       elog "To use copy it to /etc/greetd/regreet.toml\n"
-       elog "To configure greetd config.toml to use ReGreet use the ReGreet 
Readme\n"
-       elog "Or the greetd gentoo wiki page\n"
+       elog "ReGreet sample config file available on: 
/usr/share/doc/${P}/regreet.sample.toml.bz2"
+       elog "To use decompress it to /etc/greetd/regreet.toml"
+       elog "To configure greetd config.toml to use ReGreet use the ReGreet 
Readme"
+       elog "Or the greetd gentoo wiki page"
        elog ""
-       elog "/etc/greetd/config.toml - Exemple ReGreet config using cage\n"
-       elog "-----------------------------------------------------------\n"
-       elog "[terminal]\n"
-       elog "vt = 7\n"
+       elog "/etc/greetd/config.toml - Exemple ReGreet config using cage"
+       elog "-----------------------------------------------------------"
+       elog "[terminal]"
+       elog "vt = 7"
        elog ""
-       elog "[default_session]\n"
-       elog "command = "cage -s -- regreet"\n"
-       elog "user = "greetd"\n"
+       elog "[default_session]"
+       elog "command = \"cage -s -- regreet\""
+       elog "user = \"greetd\""
        elog ""
        elog "Notes:"
        elog "1 - On single user system you can change user to your home user"

diff --git a/gui-apps/ReGreet/ReGreet-9999.ebuild 
b/gui-apps/ReGreet/ReGreet-9999.ebuild
index eab0d22887..4aeff04e33 100644
--- a/gui-apps/ReGreet/ReGreet-9999.ebuild
+++ b/gui-apps/ReGreet/ReGreet-9999.ebuild
@@ -69,31 +69,30 @@ src_install() {
        if use systemd; then
                insinto /etc/tmpfiles.d/ && newins 
"${WORKDIR}/${P}/systemd-tmpfiles.conf" regreet.conf
        elif use openrc; then
-               dodir /var/log/regreet
-               fowners greeter:greeter /var/log/regreet
+               keepdir /var/log/regreet
+               fowners greetd:greetd /var/log/regreet
                fperms 0755 /var/log/regreet
 
-               dodir /var/cache/regreet
-               fowners greeter:greeter /var/cache/regreet
+               keepdir /var/cache/regreet
+               fowners greetd:greetd /var/cache/regreet
                fperms 0755 /var/cache/regreet
        fi
        # Install ReGreet template config file as a doc
-       docinto /usr/share/doc/regreet
        dodoc "${WORKDIR}/${P}/regreet.sample.toml"
 
-       elog "ReGreet sample config file available on: 
/usr/share/regreet/regreet.sample.toml\n"
-       elog "To use copy it to /etc/greetd/regreet.toml\n"
-       elog "To configure greetd config.toml to use ReGreet use the ReGreet 
Readme\n"
-       elog "Or the greetd gentoo wiki page\n"
+       elog "ReGreet sample config file available on: 
/usr/share/doc/${P}/regreet.sample.toml.bz2"
+       elog "To use decompress it to /etc/greetd/regreet.toml"
+       elog "To configure greetd config.toml to use ReGreet use the ReGreet 
Readme"
+       elog "Or the greetd gentoo wiki page"
        elog ""
-       elog "/etc/greetd/config.toml - Exemple ReGreet config using cage\n"
-       elog "-----------------------------------------------------------\n"
-       elog "[terminal]\n"
-       elog "vt = 7\n"
+       elog "/etc/greetd/config.toml - Exemple ReGreet config using cage"
+       elog "-----------------------------------------------------------"
+       elog "[terminal]"
+       elog "vt = 7"
        elog ""
-       elog "[default_session]\n"
-       elog "command = "cage -s -- regreet"\n"
-       elog "user = "greetd"\n"
+       elog "[default_session]"
+       elog "command = \"cage -s -- regreet\""
+       elog "user = \"greetd\""
        elog ""
        elog "Notes:"
        elog "1 - On single user system you can change user to your home user"

Reply via email to