From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DBF8413888F for ; Sat, 10 Oct 2015 05:11:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 255C9E080E; Sat, 10 Oct 2015 05:11:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BF27EE080E for ; Sat, 10 Oct 2015 05:11:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 57D3633E5E4 for ; Sat, 10 Oct 2015 05:11:15 +0000 (UTC) From: Mike Frysinger To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH] targets: do not prompt user Date: Sat, 10 Oct 2015 01:11:13 -0400 Message-Id: <1444453873-1156-1-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 2.5.2 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Archives-Salt: c5d64deb-1882-4a5a-9e07-9831a4358e9f X-Archives-Hash: 68748290db52c8035fd4e9a8d1f6198e 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