1 |
On 10/10/15 1:11 AM, Mike Frysinger wrote: |
2 |
> Catalyst shouldn't delay & read from stdin and prompt the user. |
3 |
> Currently, using verbose mode will trigger that behavior. |
4 |
> --- |
5 |
> targets/stage2/stage2-chroot.sh | 7 ------- |
6 |
> targets/support/chroot-functions.sh | 7 ------- |
7 |
> targets/tinderbox/tinderbox-chroot.sh | 7 ------- |
8 |
> 3 files changed, 21 deletions(-) |
9 |
> |
10 |
> diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh |
11 |
> index 0e21ea6..b426dab 100755 |
12 |
> --- a/targets/stage2/stage2-chroot.sh |
13 |
> +++ b/targets/stage2/stage2-chroot.sh |
14 |
> @@ -8,13 +8,6 @@ export FEATURES="${clst_myfeatures} nodoc noman noinfo -news" |
15 |
> if [ "${clst_VERBOSE}" ] |
16 |
> then |
17 |
> /usr/portage/scripts/bootstrap.sh -p ${bootstrap_opts} |
18 |
> - echo "Press any key within 15 seconds to pause the build..." |
19 |
> - read -s -t 15 -n 1 |
20 |
> - if [ $? -eq 0 ] |
21 |
> - then |
22 |
> - echo "Press any key to continue..." |
23 |
> - read -s -n 1 |
24 |
> - fi |
25 |
> fi |
26 |
> |
27 |
> # Set bindist USE flag if clst_BINDIST is set |
28 |
> diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh |
29 |
> index 2482651..fe40157 100755 |
30 |
> --- a/targets/support/chroot-functions.sh |
31 |
> +++ b/targets/support/chroot-functions.sh |
32 |
> @@ -288,13 +288,6 @@ run_merge() { |
33 |
> then |
34 |
> echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1 |
35 |
> emerge ${clst_myemergeopts} -pt $@ || exit 3 |
36 |
> - echo "Press any key within 15 seconds to pause the build..." |
37 |
> - read -s -t 15 -n 1 |
38 |
> - if [ $? -eq 0 ] |
39 |
> - then |
40 |
> - echo "Press any key to continue..." |
41 |
> - read -s -n 1 |
42 |
> - fi |
43 |
> fi |
44 |
> |
45 |
> echo "emerge ${clst_myemergeopts} $@" || exit 1 |
46 |
> diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh |
47 |
> index 4ebc2cc..74e46d6 100755 |
48 |
> --- a/targets/tinderbox/tinderbox-chroot.sh |
49 |
> +++ b/targets/tinderbox/tinderbox-chroot.sh |
50 |
> @@ -15,13 +15,6 @@ do |
51 |
> if [ -n "${clst_VERBOSE}" ] |
52 |
> then |
53 |
> run_merge --usepkg --buildpkg --newuse -vp $x |
54 |
> - echo "Press any key within 15 seconds to pause the build..." |
55 |
> - read -s -t 15 -n 1 |
56 |
> - if [ $? -eq 0 ] |
57 |
> - then |
58 |
> - echo "Press any key to continue..." |
59 |
> - read -s -n 1 |
60 |
> - fi |
61 |
> fi |
62 |
> |
63 |
> mkdir -p /tmp/packages/$x |
64 |
> |
65 |
|
66 |
|
67 |
I haven't followed all of your commits closely, but I assume you're |
68 |
moving towards properly daemonizing catalyst, ie. close |
69 |
stdin/stdout/stderr and redirecting to logs? |
70 |
|
71 |
-- |
72 |
Anthony G. Basile, Ph. D. |
73 |
Chair of Information Technology |
74 |
D'Youville College |
75 |
Buffalo, NY 14201 |
76 |
(716) 829-8197 |