From: Mike Frysinger <vapier@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: [gentoo-catalyst] [PATCH] targets: do not prompt user
Date: Sat, 10 Oct 2015 01:11:13 -0400 [thread overview]
Message-ID: <1444453873-1156-1-git-send-email-vapier@gentoo.org> (raw)
Catalyst shouldn't delay & read from stdin and prompt the user.
Currently, using verbose mode will trigger that behavior.
---
targets/stage2/stage2-chroot.sh | 7 -------
targets/support/chroot-functions.sh | 7 -------
targets/tinderbox/tinderbox-chroot.sh | 7 -------
3 files changed, 21 deletions(-)
diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
index 0e21ea6..b426dab 100755
--- a/targets/stage2/stage2-chroot.sh
+++ b/targets/stage2/stage2-chroot.sh
@@ -8,13 +8,6 @@ export FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
if [ "${clst_VERBOSE}" ]
then
/usr/portage/scripts/bootstrap.sh -p ${bootstrap_opts}
- echo "Press any key within 15 seconds to pause the build..."
- read -s -t 15 -n 1
- if [ $? -eq 0 ]
- then
- echo "Press any key to continue..."
- read -s -n 1
- fi
fi
# Set bindist USE flag if clst_BINDIST is set
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 2482651..fe40157 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -288,13 +288,6 @@ run_merge() {
then
echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1
emerge ${clst_myemergeopts} -pt $@ || exit 3
- echo "Press any key within 15 seconds to pause the build..."
- read -s -t 15 -n 1
- if [ $? -eq 0 ]
- then
- echo "Press any key to continue..."
- read -s -n 1
- fi
fi
echo "emerge ${clst_myemergeopts} $@" || exit 1
diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
index 4ebc2cc..74e46d6 100755
--- a/targets/tinderbox/tinderbox-chroot.sh
+++ b/targets/tinderbox/tinderbox-chroot.sh
@@ -15,13 +15,6 @@ do
if [ -n "${clst_VERBOSE}" ]
then
run_merge --usepkg --buildpkg --newuse -vp $x
- echo "Press any key within 15 seconds to pause the build..."
- read -s -t 15 -n 1
- if [ $? -eq 0 ]
- then
- echo "Press any key to continue..."
- read -s -n 1
- fi
fi
mkdir -p /tmp/packages/$x
--
2.5.2
next reply other threads:[~2015-10-10 5:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-10 5:11 Mike Frysinger [this message]
2015-10-10 9:13 ` [gentoo-catalyst] [PATCH] targets: do not prompt user Anthony G. Basile
2015-10-10 22:10 ` Mike Frysinger
2015-10-10 23:11 ` Brian Dolbec
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=1444453873-1156-1-git-send-email-vapier@gentoo.org \
--to=vapier@gentoo.org \
--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