1 |
commit: 56fa5b20fd5d6037ea935b36e33b32e8f14a78c0 |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 10 05:09:42 2015 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 10 23:54:36 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=56fa5b20 |
7 |
|
8 |
targets: do not prompt user |
9 |
|
10 |
Catalyst shouldn't delay & read from stdin and prompt the user. |
11 |
Currently, using verbose mode will trigger that behavior. |
12 |
|
13 |
targets/stage2/stage2-chroot.sh | 7 ------- |
14 |
targets/support/chroot-functions.sh | 7 ------- |
15 |
targets/tinderbox/tinderbox-chroot.sh | 7 ------- |
16 |
3 files changed, 21 deletions(-) |
17 |
|
18 |
diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh |
19 |
index 0e21ea6..b426dab 100755 |
20 |
--- a/targets/stage2/stage2-chroot.sh |
21 |
+++ b/targets/stage2/stage2-chroot.sh |
22 |
@@ -8,13 +8,6 @@ export FEATURES="${clst_myfeatures} nodoc noman noinfo -news" |
23 |
if [ "${clst_VERBOSE}" ] |
24 |
then |
25 |
/usr/portage/scripts/bootstrap.sh -p ${bootstrap_opts} |
26 |
- echo "Press any key within 15 seconds to pause the build..." |
27 |
- read -s -t 15 -n 1 |
28 |
- if [ $? -eq 0 ] |
29 |
- then |
30 |
- echo "Press any key to continue..." |
31 |
- read -s -n 1 |
32 |
- fi |
33 |
fi |
34 |
|
35 |
# Set bindist USE flag if clst_BINDIST is set |
36 |
|
37 |
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh |
38 |
index 2482651..fe40157 100755 |
39 |
--- a/targets/support/chroot-functions.sh |
40 |
+++ b/targets/support/chroot-functions.sh |
41 |
@@ -288,13 +288,6 @@ run_merge() { |
42 |
then |
43 |
echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1 |
44 |
emerge ${clst_myemergeopts} -pt $@ || exit 3 |
45 |
- echo "Press any key within 15 seconds to pause the build..." |
46 |
- read -s -t 15 -n 1 |
47 |
- if [ $? -eq 0 ] |
48 |
- then |
49 |
- echo "Press any key to continue..." |
50 |
- read -s -n 1 |
51 |
- fi |
52 |
fi |
53 |
|
54 |
echo "emerge ${clst_myemergeopts} $@" || exit 1 |
55 |
|
56 |
diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh |
57 |
index 4ebc2cc..74e46d6 100755 |
58 |
--- a/targets/tinderbox/tinderbox-chroot.sh |
59 |
+++ b/targets/tinderbox/tinderbox-chroot.sh |
60 |
@@ -15,13 +15,6 @@ do |
61 |
if [ -n "${clst_VERBOSE}" ] |
62 |
then |
63 |
run_merge --usepkg --buildpkg --newuse -vp $x |
64 |
- echo "Press any key within 15 seconds to pause the build..." |
65 |
- read -s -t 15 -n 1 |
66 |
- if [ $? -eq 0 ] |
67 |
- then |
68 |
- echo "Press any key to continue..." |
69 |
- read -s -n 1 |
70 |
- fi |
71 |
fi |
72 |
|
73 |
mkdir -p /tmp/packages/$x |