[PATCH 05/12] android-wrapper: Quiet down wget

Dirk Hohndel dirk at hohndel.org
Mon Feb 6 21:13:35 PST 2017


On Mon, Feb 06, 2017 at 03:55:35PM +0100, Anton Lundin wrote:
> Signed-off-by: Anton Lundin <glance at acc.umu.se>
> ---
>  packaging/android/android-build-wrapper.sh | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh
> index 3eadf92..60325c8 100644
> --- a/packaging/android/android-build-wrapper.sh
> +++ b/packaging/android/android-build-wrapper.sh
> @@ -55,7 +55,7 @@ fi
>  QT_DOWNLOAD_URL=https://download.qt.io/archive/qt/${QT_VERSION}/${LATEST_QT}/${QT_BINARIES}
>  if [ ! -d Qt${LATEST_QT} ] ; then
>  	if [ ! -f ${QT_BINARIES} ] ; then
> -		wget ${QT_DOWNLOAD_URL}
> +		wget -q ${QT_DOWNLOAD_URL}

I took this (because I find the MASSIVELY verbose output annoying, too),
but we should at least have a warning for the interactive user that says
something like "downloading 700+MB of data - depending on your internet
speed this could take a while. And similar warnings (with smaller sizes,
of course) below...

/D

>  	fi
>  	echo "In the binary installer select $(pwd)/${LATEST_QT} as install directory"
>  	chmod +x ./${QT_BINARIES}
> @@ -70,14 +70,14 @@ sed -i 's/set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_
>  # next we need to get the Android SDK and NDK
>  if [ ! -d $ANDROID_NDK ] ; then
>  	if [ ! -f $NDK_BINARIES ] ; then
> -		wget https://dl.google.com/android/repository/$NDK_BINARIES
> +		wget -q https://dl.google.com/android/repository/$NDK_BINARIES
>  	fi
>  	unzip $NDK_BINARIES
>  fi
>  
>  if [ ! -d $ANDROID_SDK ] ; then
>  	if [ ! -f $SDK_TOOLS ] ; then
> -		wget https://dl.google.com/android/repository/$SDK_TOOLS
> +		wget -q https://dl.google.com/android/repository/$SDK_TOOLS
>  	fi
>  	mkdir $ANDROID_SDK
>  	pushd $ANDROID_SDK
> -- 
> 2.9.3
> 
> _______________________________________________
> subsurface mailing list
> subsurface at subsurface-divelog.org
> http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface


More information about the subsurface mailing list