[gentoo-catalyst] [PATCH] targets: do not prompt user

[gentoo-catalyst] [PATCH] targets: do not prompt user

[Mike Frysinger]

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

Re: [gentoo-catalyst] [PATCH] targets: do not prompt user

[Anthony G. Basile]

On 10/10/15 1:11 AM, Mike Frysinger wrote:
> 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
>


I haven't followed all of your commits closely, but I assume you're 
moving towards properly daemonizing catalyst, ie. close 
stdin/stdout/stderr and redirecting to logs?

-- 
Anthony G. Basile, Ph. D.
Chair of Information Technology
D'Youville College
Buffalo, NY 14201
(716) 829-8197

Re: [gentoo-catalyst] [PATCH] targets: do not prompt user

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 398 bytes --]

On 10 Oct 2015 05:13, Anthony G. Basile wrote:
> I haven't followed all of your commits closely, but I assume you're 
> moving towards properly daemonizing catalyst, ie. close 
> stdin/stdout/stderr and redirecting to logs?

i didn't really have a goal in mind.  i started out with some issues
that have annoyed me for a while, and then just saw things in the code
that needed help.
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-catalyst] [PATCH] targets: do not prompt user

[Brian Dolbec]

On Sat, 10 Oct 2015 01:11:13 -0400
Mike Frysinger <vapier@gentoo.org> wrote:

> 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

looks good, I've heard no objections, so push it :)

If it is really needed we can re-use the tiny function I put to help
debug some issues.  But I highly doubt it will be. 

-- 
Brian Dolbec <dolsen>