public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
Date: Sat,  5 Aug 2023 22:29:48 +0000 (UTC)	[thread overview]
Message-ID: <1691274510.98cb41a01f37e5161de5c6ae159d3dfe80c29376.sam@gentoo> (raw)

commit:     98cb41a01f37e5161de5c6ae159d3dfe80c29376
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  5 22:26:38 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug  5 22:28:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98cb41a0

x11-wm/fvwm3: fix shebang in /etc/X11/Sessions file

A file in /etc/X11/Sessions with just the path that's *not* executable is fine,
but if it's executable, it's reasonably treated as a script. Oops.

Bug: https://bugs.gentoo.org/911787

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-wm/fvwm3/{fvwm3-9999.ebuild => fvwm3-1.0.7-r1.ebuild} | 8 +++++---
 x11-wm/fvwm3/fvwm3-9999.ebuild                            | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-1.0.7-r1.ebuild
similarity index 96%
copy from x11-wm/fvwm3/fvwm3-9999.ebuild
copy to x11-wm/fvwm3/fvwm3-1.0.7-r1.ebuild
index 46cdabe5b388..897728504f51 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-1.0.7-r1.ebuild
@@ -141,9 +141,11 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" datarootdir="/usr/share" install
 
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/fvwm3" > "${ED}/etc/X11/Sessions/${PN}" || die
-	fperms a+x "/etc/X11/Sessions/${PN}" || die
+	exeinto /etc/X11/Sessions
+	newexe - ${PN} <<-EOF
+	#!/bin/sh
+	${PN}
+	EOF
 
 	python_scriptinto "/usr/bin"
 	python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"

diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index 46cdabe5b388..897728504f51 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -141,9 +141,11 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" datarootdir="/usr/share" install
 
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/fvwm3" > "${ED}/etc/X11/Sessions/${PN}" || die
-	fperms a+x "/etc/X11/Sessions/${PN}" || die
+	exeinto /etc/X11/Sessions
+	newexe - ${PN} <<-EOF
+	#!/bin/sh
+	${PN}
+	EOF
 
 	python_scriptinto "/usr/bin"
 	python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"


             reply	other threads:[~2023-08-05 22:29 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-05 22:29 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-06-27  9:16 [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/ Matt Jolly
2025-06-04 10:22 Matt Jolly
2025-06-04 10:22 Matt Jolly
2025-05-01  7:34 Arthur Zamarin
2025-04-29  2:01 Sam James
2025-04-29  2:01 Sam James
2025-04-29  0:31 Matt Jolly
2025-03-12 23:24 Sam James
2025-02-20 11:38 Matt Jolly
2025-01-30  9:57 Arthur Zamarin
2025-01-30  0:10 Sam James
2025-01-30  0:10 Sam James
2025-01-30  0:10 Sam James
2024-12-15  5:18 Matt Jolly
2024-12-03  0:09 Matt Jolly
2024-12-03  0:09 Matt Jolly
2024-12-02 22:34 Matt Jolly
2024-11-08  8:29 Matt Jolly
2024-10-20 22:06 Matt Jolly
2024-03-22  3:14 Matt Jolly
2024-03-22  3:14 Matt Jolly
2024-03-22  3:06 Matt Jolly
2024-01-20 12:04 Sam James
2023-12-13  2:11 Sam James
2023-12-13  2:06 Sam James
2023-10-17  6:37 Joonas Niilola
2023-10-17  6:37 Joonas Niilola
2023-07-26  2:53 Sam James
2023-07-26  2:53 Sam James
2022-12-03  7:50 Sam James
2022-11-24  6:37 Jakov Smolić
2022-06-18 14:44 David Seifert
2022-06-18  7:42 David Seifert
2022-06-06 13:33 Yixun Lan
2022-06-06 13:33 Yixun Lan
2022-06-04 21:14 Sam James

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1691274510.98cb41a01f37e5161de5c6ae159d3dfe80c29376.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox