From: "W. Trevor King" <wking@tremily.us>
To: Catalyst <gentoo-catalyst@lists.gentoo.org>
Cc: "W. Trevor King" <wking@tremily.us>
Subject: [gentoo-catalyst] [PATCH] livecdfs-update.sh: Escape ampersands in STARTX sed expression
Date: Sun, 03 Mar 2013 11:53:18 -0500 [thread overview]
Message-ID: <48b5405f720c6aa9e9472be0fc3a66e7ef336d3e.1362329514.git.wking@tremily.us> (raw)
From: "W. Trevor King" <wking@tremily.us>
From sed(1):
s/regexp/replacement/
Attempt to match regexp against the pattern space. If successful,
replace that portion matched with replacement. The replacement
may contain the special character & to refer to that portion of
the pattern space which matched, and the special escapes \1
through \9 to refer to the corresponding matching sub-expressions
in the regexp.
This means that the old expression (with unescaped ampersands) lead
to:
source /etc/profile ##STARTX##STARTX su - ${first_user} -c startx
when we want:
source /etc/profile && su - ${first_user} -c startx
with ${first_user} expanded in both cases.
---
targets/support/livecdfs-update.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 77d694e..fda3e36 100644
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -389,7 +389,7 @@ esac
if [ -e /etc/startx ]
then
sed -i \
- "s:##STARTX:source /etc/profile && su - ${first_user} -c startx:" \
+ "s:##STARTX:source /etc/profile \&\& su - ${first_user} -c startx:" \
/root/.bashrc
fi
--
1.8.2.rc0.16.g20a599e
next reply other threads:[~2013-03-03 17:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-03 16:53 W. Trevor King [this message]
2013-03-04 3:13 ` [gentoo-catalyst] [PATCH] livecd-bashrc: Avoid a startx race by restricting to tty1 W. Trevor King
2013-03-06 17:02 ` [gentoo-catalyst] [PATCH v2 0/2] Fix livecdfs-update.sh startx handling W. Trevor King
2013-03-06 17:02 ` [gentoo-catalyst] [PATCH v2 1/2] livecd-bashrc: Avoid a startx race by restricting to tty1 W. Trevor King
2013-03-06 17:02 ` [gentoo-catalyst] [PATCH v2 2/2] livecdfs-update.sh: Use `bash --login` to spawn startx W. Trevor King
2013-03-09 2:55 ` Matt Turner
2013-03-09 11:48 ` [gentoo-catalyst] " W. Trevor King
2013-03-09 2:49 ` [gentoo-catalyst] [PATCH] livecd-bashrc: Avoid a startx race by restricting to tty1 Matt Turner
2013-03-09 11:46 ` [gentoo-catalyst] " W. Trevor King
2013-03-09 2:47 ` [gentoo-catalyst] [PATCH] livecdfs-update.sh: Escape ampersands in STARTX sed expression Matt Turner
2013-03-09 11:48 ` [gentoo-catalyst] " W. Trevor King
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=48b5405f720c6aa9e9472be0fc3a66e7ef336d3e.1362329514.git.wking@tremily.us \
--to=wking@tremily.us \
--cc=gentoo-catalyst@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