Re: [PATCH] make.sh: Add OPTION to not clear screen

[Jon Murphy <jcmurphy26@gmail.com>]

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

Please delete this patch.  

V2 already sent.

Jon


> On May 29, 2022, at 1:51 PM, Jon Murphy <jon.murphy(a)ipfire.org> wrote:
> 
> - minor changes to build and toolchain section
> - screen will not clear if option "--no-clear" is included
> - assists beginners (me!) view all steps in build process
> 
> Signed-off-by: Jon Murphy <jon.murphy(a)ipfire.org>
> ---
> doc/make.sh-usage |  3 +++
> make.sh           | 10 ++++++++--
> 2 files changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/doc/make.sh-usage b/doc/make.sh-usage
> index 5e1e3dd22..32e7fd862 100644
> --- a/doc/make.sh-usage
> +++ b/doc/make.sh-usage
> @@ -21,3 +21,6 @@ Options:
>                                        the desired target architecture.
>                                        Can be permanently set with TARGET_ARCH= in
>                                        .config.
> +
> +    --no-clear : do not clear screen when during command build or toolchain
> +
> diff --git a/make.sh b/make.sh
> index 3ed9190b9..1e22a513b 100755
> --- a/make.sh
> +++ b/make.sh
> @@ -1803,11 +1803,17 @@ ipfirepackages() {
>   rm -rf  $BASEDIR/build/install/packages/*
> }
> 
> +# Default setting
> +CLEAR_SCREEN=true
> +
> while [ $# -gt 0 ]; do
> 	case "${1}" in
> 		--target=*)
> 			configure_build "${1#--target=}"
> 			;;
> +		--no-clear)
> +			CLEAR_SCREEN=false
> +			;;
> 		-*)
> 			exiterror "Unknown configuration option: ${1}"
> 			;;
> @@ -1825,7 +1831,7 @@ build)
> 	START_TIME="${SECONDS}"
> 
> 	# Clear screen
> -	${INTERACTIVE} && clear
> +	${INTERACTIVE} && ${CLEAR_SCREEN} && clear
> 
> 	PACKAGE="$BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.zst"
> 	#only restore on a clean disk
> @@ -1971,7 +1977,7 @@ downloadsrc)
> 	;;
> toolchain)
> 	# Clear screen
> -	${INTERACTIVE} && clear
> +	${INTERACTIVE} && ${CLEAR_SCREEN} && clear
> 
> 	prepareenv
> 	print_build_stage "Toolchain compilation (${BUILD_ARCH})"
> -- 
> 2.30.2
>