maj

2017-12-11 22:51:04 +01:00 · 2017-12-11 22:51:04 +01:00 · 7d56ec829a
parent f2327b7052
commit 7d56ec829a
5 changed files with 1077 additions and 105 deletions
--- a/scripts/tests/alsa-info_alsa-info.sh
+++ b/scripts/tests/alsa-info_alsa-info.sh
@ -0,0 +1,968 @@
+#!/bin/bash
+
+SCRIPT_VERSION=0.4.64
+CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"
+
+#################################################################################
+#Copyright (C) 2007 Free Software Foundation.
+
+#This program is free software; you can redistribute it and/or modify
+#it under the terms of the GNU General Public License as published by
+#the Free Software Foundation; either version 2 of the License, or
+#(at your option) any later version.
+
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+##################################################################################
+
+#The script was written for 2 main reasons:
+# 1. Remove the need for the devs/helpers to ask several questions before we can easily help the user.
+# 2. Allow newer/inexperienced ALSA users to give us all the info we need to help them.
+
+#Set the locale (this may or may not be a good idea.. let me know)
+export LC_ALL=C
+
+#Change the PATH variable, so we can run lspci (needed for some distros)
+PATH=$PATH:/bin:/sbin:/usr/bin:/usr/sbin
+BGTITLE="ALSA-Info v $SCRIPT_VERSION"
+PASTEBINKEY="C9cRIO8m/9y8Cs0nVs0FraRx7U0pHsuc"
+#Define some simple functions
+
+WGET=$(which wget 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
+
+pbcheck(){
+	[[ $UPLOAD = "no" ]] && return
+
+	if [[ -z $PASTEBIN ]]; then
+		[[ $(ping -c1 www.alsa-project.org) ]] || KEEP_FILES="yes" UPLOAD="no" PBERROR="yes"
+	else
+		[[ $(ping -c1 www.pastebin.ca) ]] || KEEP_FILES="yes" UPLOAD="no" PBERROR="yes"
+	fi
+}
+
+update() {
+	test -z "$WGET" -o ! -x "$WGET" && return
+
+	SHFILE=`mktemp -t alsa-info.XXXXXXXXXX` || exit 1
+	wget -O $SHFILE "http://www.alsa-project.org/alsa-info.sh" >/dev/null 2>&1
+	REMOTE_VERSION=`grep SCRIPT_VERSION $SHFILE |head -n1 |sed 's/.*=//'`
+	if [ -s "$SHFILE" -a "$REMOTE_VERSION" != "$SCRIPT_VERSION" ]; then
+		if [[ -n $DIALOG ]]
+		then
+			OVERWRITE=
+			if [ -w $0 ]; then
+				dialog --yesno "Newer version of ALSA-Info has been found\n\nDo you wish to install it?\nNOTICE: The original file $0 will be overwritten!" 0 0
+				DIALOG_EXIT_CODE=$?
+				if [[ $DIALOG_EXIT_CODE = 0 ]]; then
+				  OVERWRITE=yes
+				fi
+			fi
+			if [ -z "$OVERWRITE" ]; then
+				dialog --yesno "Newer version of ALSA-Info has been found\n\nDo you wish to download it?" 0 0
+				DIALOG_EXIT_CODE=$?
+			fi
+			if [[ $DIALOG_EXIT_CODE = 0 ]]
+			then
+				echo "Newer version detected: $REMOTE_VERSION"
+				echo "To view the ChangeLog, please visit $CHANGELOG"
+				if [ "$OVERWRITE" = "yes" ]; then
+					cp $SHFILE $0
+					echo "ALSA-Info script has been updated to v $REMOTE_VERSION"
+					echo "Please re-run the script"
+					rm $SHFILE 2>/dev/null
+				else
+					echo "ALSA-Info script has been downloaded as $SHFILE."
+					echo "Please re-run the script from new location."
+				fi
+				exit
+			else
+				rm $SHFILE 2>/dev/null
+			fi
+		else
+			echo "Newer version detected: $REMOTE_VERSION"
+			echo "To view the ChangeLog, please visit $CHANGELOG"
+			if [ -w $0 ]; then
+				echo "The original file $0 will be overwritten!"
+				echo -n "If you do not like to proceed, press Ctrl-C now.." ; read inp
+				cp $SHFILE $0
+				echo "ALSA-Info script has been updated. Please re-run it."
+				rm $SHFILE 2>/dev/null
+			else
+				echo "ALSA-Info script has been downloaded $SHFILE."
+				echo "Please, re-run it from new location."
+			fi
+			exit
+		fi
+	else
+		rm $SHFILE 2>/dev/null
+	fi
+}
+
+cleanup() {
+	if [ -n "$TEMPDIR" -a "$KEEP_FILES" != "yes" ]; then
+		rm -rf "$TEMPDIR" 2>/dev/null
+	fi
+	test -n "$KEEP_OUTPUT" || rm -f "$NFILE"
+}
+
+
+withaplay() {
+        echo "!!Aplay/Arecord output" >> $FILE
+        echo "!!--------------------" >> $FILE
+        echo "" >> $FILE
+       	echo "APLAY" >> $FILE
+	echo "" >> $FILE 
+	aplay -l >> $FILE 2>&1
+        echo "" >> $FILE
+       	echo "ARECORD" >> $FILE
+	echo "" >> $FILE
+	arecord -l >> $FILE 2>&1
+	echo "" >> $FILE
+}
+
+withlsmod() {
+	echo "!!All Loaded Modules" >> $FILE
+	echo "!!------------------" >> $FILE
+	echo "" >> $FILE
+	lsmod |awk {'print $1'} >> $FILE
+	echo "" >> $FILE
+	echo "" >> $FILE
+}
+
+withamixer() {
+        echo "!!Amixer output" >> $FILE
+        echo "!!-------------" >> $FILE
+        echo "" >> $FILE
+	for i in `grep "]: " /proc/asound/cards | awk -F ' ' '{ print $1} '` ; do
+	CARD_NAME=`grep "^ *$i " $TEMPDIR/alsacards.tmp|awk {'print $2'}`
+	echo "!!-------Mixer controls for card $i $CARD_NAME]" >> $FILE
+	echo "" >>$FILE
+	amixer -c$i info>> $FILE 2>&1
+	amixer -c$i>> $FILE 2>&1
+        echo "" >> $FILE
+	done
+	echo "" >> $FILE
+}
+
+withalsactl() {
+	echo "!!Alsactl output" >> $FILE
+        echo "!!--------------" >> $FILE
+        echo "" >> $FILE
+        exe=""
+        if [ -x /usr/sbin/alsactl ]; then
+        	exe="/usr/sbin/alsactl"
+        fi
+        if [ -x /usr/local/sbin/alsactl ]; then
+        	exe="/usr/local/sbin/alsactl"
+        fi
+        if [ -z "$exe" ]; then
+        	exe=`whereis alsactl | cut -d ' ' -f 2`
+        fi
+	$exe -f $TEMPDIR/alsactl.tmp store
+	echo "--startcollapse--" >> $FILE
+	cat $TEMPDIR/alsactl.tmp >> $FILE
+	echo "--endcollapse--" >> $FILE
+	echo "" >> $FILE
+	echo "" >> $FILE
+}
+
+withdevices() {
+        echo "!!ALSA Device nodes" >> $FILE
+        echo "!!-----------------" >> $FILE
+        echo "" >> $FILE
+        ls -la /dev/snd/* >> $FILE
+        echo "" >> $FILE
+        echo "" >> $FILE
+}
+
+withconfigs() {
+if [[ -e $HOME/.asoundrc ]] || [[ -e /etc/asound.conf ]] || [[ -e $HOME/.asoundrc.asoundconf ]]
+then
+        echo "!!ALSA configuration files" >> $FILE
+        echo "!!------------------------" >> $FILE
+        echo "" >> $FILE
+
+        #Check for ~/.asoundrc
+        if [[ -e $HOME/.asoundrc ]]
+        then
+                echo "!!User specific config file (~/.asoundrc)" >> $FILE
+                echo "" >> $FILE
+                cat $HOME/.asoundrc >> $FILE
+                echo "" >> $FILE
+                echo "" >> $FILE
+        fi
+	#Check for .asoundrc.asoundconf (seems to be Ubuntu specific)
+	if [[ -e $HOME/.asoundrc.asoundconf ]]
+	then
+		echo "!!asoundconf-generated config file" >> $FILE
+		echo "" >> $FILE
+		cat $HOME/.asoundrc.asoundconf >> $FILE
+		echo "" >> $FILE
+		echo "" >> $FILE
+	fi
+        #Check for /etc/asound.conf
+        if [[ -e /etc/asound.conf ]]
+        then
+                echo "!!System wide config file (/etc/asound.conf)" >> $FILE
+                echo "" >> $FILE
+                cat /etc/asound.conf >> $FILE
+                echo "" >> $FILE
+                echo "" >> $FILE
+        fi
+fi
+}
+
+withsysfs() {
+    local i f
+    local printed=""
+    for i in /sys/class/sound/*; do
+	case "$i" in
+	    */hwC?D?)
+		if [ -f $i/init_pin_configs ]; then
+		    if [ -z "$printed" ]; then
+			echo "!!Sysfs Files" >> $FILE
+			echo "!!-----------" >> $FILE
+			echo "" >> $FILE
+		    fi
+		    for f in init_pin_configs driver_pin_configs user_pin_configs init_verbs hints; do
+			echo "$i/$f:" >> $FILE
+			cat $i/$f >> $FILE
+			echo >> $FILE
+		    done
+		    printed=yes
+		fi
+		;;
+	    esac
+    done
+    if [ -n "$printed" ]; then
+	echo "" >> $FILE
+    fi
+}
+
+withdmesg() {
+	echo "!!ALSA/HDA dmesg" >> $FILE
+	echo "!!--------------" >> $FILE
+	echo "" >> $FILE
+	dmesg | grep -C1 -E 'ALSA|HDA|HDMI|snd[_-]|sound|hda.codec|hda.intel' >> $FILE
+	echo "" >> $FILE
+	echo "" >> $FILE
+}
+
+withall() {
+	withdevices
+	withconfigs
+	withaplay
+	withamixer
+	withalsactl
+	withlsmod
+	withsysfs
+	withdmesg
+	WITHALL="no"
+}
+
+get_alsa_library_version() {
+	ALSA_LIB_VERSION=`grep VERSION_STR /usr/include/alsa/version.h 2>/dev/null|awk {'print $3'}|sed 's/"//g'`
+
+	if [ -z "$ALSA_LIB_VERSION" ]; then
+		if [ -f /etc/lsb-release ]; then
+			. /etc/lsb-release
+			case "$DISTRIB_ID" in
+				Ubuntu)
+					if which dpkg > /dev/null ; then
+						ALSA_LIB_VERSION=`dpkg -l libasound2 | tail -1 | awk '{print $3}' | cut -f 1 -d -`
+					fi
+
+					if [ "$ALSA_LIB_VERSION" = "<none>" ]; then
+						ALSA_LIB_VERSION=""
+					fi
+					return
+					;;
+				*)
+					return
+					;;
+			esac
+		elif [ -f /etc/debian_version ]; then
+			if which dpkg > /dev/null ; then
+				ALSA_LIB_VERSION=`dpkg -l libasound2 | tail -1 | awk '{print $3}' | cut -f 1 -d -`
+			fi
+
+			if [ "$ALSA_LIB_VERSION" = "<none>" ]; then
+				ALSA_LIB_VERSION=""
+			fi
+			return
+		fi
+	fi
+}
+
+
+#Run checks to make sure the programs we need are installed.
+LSPCI=$(which lspci 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null);
+TPUT=$(which tput 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null);
+DIALOG=$(which dialog 2>/dev/null | sed 's|^[^/]*||' 2>/dev/null);
+
+#Check to see if sysfs is enabled in the kernel. We'll need this later on
+SYSFS=$(mount |grep sysfs|awk {'print $3'});
+
+#Check modprobe config files for sound related options
+SNDOPTIONS=$(modprobe -c|sed -n 's/^options \(snd[-_][^ ]*\)/\1:/p')
+
+KEEP_OUTPUT=
+NFILE=""
+
+PASTEBIN=""
+WWWSERVICE="www.alsa-project.org"
+WELCOME="yes"
+PROCEED="yes"
+UPLOAD="ask"
+REPEAT=""
+while [ -z "$REPEAT" ]; do
+REPEAT="no"
+case "$1" in
+	--update|--help|--about)
+		WELCOME="no"
+		PROCEED="no"
+		;;
+	--upload)
+		UPLOAD="yes"
+		WELCOME="no"
+		;;
+	--no-upload)
+		UPLOAD="no"
+		WELCOME="no"
+		;;
+	--pastebin)
+		PASTEBIN="yes"
+		WWWSERVICE="pastebin"
+		;;
+	--no-dialog)
+		DIALOG=""
+		REPEAT=""
+		shift
+		;;
+	--stdout)
+		DIALOG=""
+		UPLOAD="no"
+		WELCOME="no"
+		TOSTDOUT="yes"
+		;;
+esac
+done
+
+
+#Script header output.
+if [ "$WELCOME" = "yes" ]; then
+greeting_message="\
+
+This script visits the following commands/files to collect diagnostic
+information about your ALSA installation and sound related hardware.
+
+  dmesg
+  lspci
+  lsmod
+  aplay
+  amixer
+  alsactl
+  /proc/asound/
+  /sys/class/sound/
+  ~/.asoundrc (etc.)
+
+See '$0 --help' for command line options.
+"
+if [ -n "$DIALOG" ]; then
+	dialog  --backtitle "$BGTITLE" \
+		--title "ALSA-Info script v $SCRIPT_VERSION" \
+		--msgbox "$greeting_message" 20 80
+else
+	echo "ALSA Information Script v $SCRIPT_VERSION"
+	echo "--------------------------------"
+	echo "$greeting_message"
+fi # dialog
+fi # WELCOME
+
+#Set the output file
+TEMPDIR=`mktemp -t -d alsa-info.XXXXXXXXXX` || exit 1
+FILE="$TEMPDIR/alsa-info.txt"
+if [ -z "$NFILE" ]; then
+	NFILE=`mktemp -t alsa-info.txt.XXXXXXXXXX` || exit 1
+fi
+
+trap cleanup 0
+
+if [ "$PROCEED" = "yes" ]; then
+
+if [ -z "$LSPCI" ]; then
+	if [ -d /sys/bus/pci ]; then
+		echo "This script requires lspci. Please install it, and re-run this script."
+		exit 0
+	fi
+fi
+
+#Fetch the info and store in temp files/variables
+DISTRO=`grep -ihs "buntu\|SUSE\|Fedora\|PCLinuxOS\|MEPIS\|Mandriva\|Debian\|Damn\|Sabayon\|Slackware\|KNOPPIX\|Gentoo\|Zenwalk\|Mint\|Kubuntu\|FreeBSD\|Puppy\|Freespire\|Vector\|Dreamlinux\|CentOS\|Arch\|Xandros\|Elive\|SLAX\|Red\|BSD\|KANOTIX\|Nexenta\|Foresight\|GeeXboX\|Frugalware\|64\|SystemRescue\|Novell\|Solaris\|BackTrack\|KateOS\|Pardus" /etc/{issue,*release,*version}`
+KERNEL_VERSION=`uname -r`
+KERNEL_PROCESSOR=`uname -p`
+KERNEL_MACHINE=`uname -m`
+KERNEL_OS=`uname -o`
+[[ `uname -v | grep SMP`  ]] && KERNEL_SMP="Yes" || KERNEL_SMP="No" 
+ALSA_DRIVER_VERSION=`cat /proc/asound/version |head -n1|awk {'print $7'} |sed 's/\.$//'`
+get_alsa_library_version
+ALSA_UTILS_VERSION=`amixer -v |awk {'print $3'}`
+LAST_CARD=$((`grep "]: " /proc/asound/cards | wc -l` - 1 ))
+
+ESDINST=$(which esd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
+PAINST=$(which pulseaudio 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
+ARTSINST=$(which artsd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
+JACKINST=$(which jackd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
+ROARINST=$(which roard 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
+DMIDECODE=$(which dmidecode 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
+
+#Check for DMI data
+if [ -d /sys/class/dmi/id ]; then
+    # No root privileges are required when using sysfs method
+    DMI_SYSTEM_MANUFACTURER=$(cat /sys/class/dmi/id/sys_vendor 2>/dev/null)
+    DMI_SYSTEM_PRODUCT_NAME=$(cat /sys/class/dmi/id/product_name 2>/dev/null)
+    DMI_SYSTEM_PRODUCT_VERSION=$(cat /sys/class/dmi/id/product_version 2>/dev/null)
+    DMI_SYSTEM_FIRMWARE_VERSION=$(cat /sys/class/dmi/id/bios_version 2>/dev/null)
+    DMI_BOARD_VENDOR=$(cat /sys/class/dmi/id/board_vendor 2>/dev/null)
+    DMI_BOARD_NAME=$(cat /sys/class/dmi/id/board_name 2>/dev/null)
+elif [ -x $DMIDECODE ]; then
+    DMI_SYSTEM_MANUFACTURER=$($DMIDECODE -s system-manufacturer 2>/dev/null)
+    DMI_SYSTEM_PRODUCT_NAME=$($DMIDECODE -s system-product-name 2>/dev/null)
+    DMI_SYSTEM_PRODUCT_VERSION=$($DMIDECODE -s system-version 2>/dev/null)
+    DMI_SYSTEM_FIRMWARE_VERSION=$($DMIDECODE -s bios-version 2>/dev/null)
+    DMI_BOARD_VENDOR=$($DMIDECODE -s baseboard-manufacturer 2>/dev/null)
+    DMI_BOARD_NAME=$($DMIDECODE -s baseboard-product-name 2>/dev/null)
+fi
+
+# Check for ACPI device status
+if [ -d /sys/bus/acpi/devices ]; then
+    for f in /sys/bus/acpi/devices/*/status; do
+	ACPI_STATUS=$(cat $f 2>/dev/null);
+	if [[ "$ACPI_STATUS" -ne 0 ]]; then
+	    echo $f $'\t' $ACPI_STATUS >>$TEMPDIR/acpidevicestatus.tmp;
+	fi
+    done
+fi
+
+cat /proc/asound/modules 2>/dev/null|awk {'print $2'}>$TEMPDIR/alsamodules.tmp
+cat /proc/asound/cards >$TEMPDIR/alsacards.tmp
+if [[ ! -z "$LSPCI" ]]; then
+lspci |grep -i "multi\|audio">$TEMPDIR/lspci.tmp
+fi
+
+#Check for HDA-Intel cards codec#*
+cat /proc/asound/card*/codec\#* > $TEMPDIR/alsa-hda-intel.tmp 2> /dev/null
+
+#Check for AC97 cards codec
+cat /proc/asound/card*/codec97\#0/ac97\#0-0 > $TEMPDIR/alsa-ac97.tmp 2> /dev/null
+cat /proc/asound/card*/codec97\#0/ac97\#0-0+regs > $TEMPDIR/alsa-ac97-regs.tmp 2> /dev/null
+
+#Check for USB mixer setup
+cat /proc/asound/card*/usbmixer > $TEMPDIR/alsa-usbmixer.tmp 2> /dev/null
+
+#Fetch the info, and put it in $FILE in a nice readable format.
+if [[ -z $PASTEBIN ]]; then
+echo "upload=true&script=true&cardinfo=" > $FILE
+else
+echo "name=$USER&type=33&description=/tmp/alsa-info.txt&expiry=&s=Submit+Post&content=" > $FILE
+fi
+echo "!!################################" >> $FILE
+echo "!!ALSA Information Script v $SCRIPT_VERSION" >> $FILE
+echo "!!################################" >> $FILE
+echo "" >> $FILE
+echo "!!Script ran on: `LANG=C TZ=UTC date`" >> $FILE
+echo "" >> $FILE
+echo "" >> $FILE
+echo "!!Linux Distribution" >> $FILE
+echo "!!------------------" >> $FILE
+echo "" >> $FILE
+echo $DISTRO >> $FILE
+echo "" >> $FILE
+echo "" >> $FILE
+echo "!!DMI Information" >> $FILE
+echo "!!---------------" >> $FILE
+echo "" >> $FILE
+echo "Manufacturer:      $DMI_SYSTEM_MANUFACTURER" >> $FILE
+echo "Product Name:      $DMI_SYSTEM_PRODUCT_NAME" >> $FILE
+echo "Product Version:   $DMI_SYSTEM_PRODUCT_VERSION" >> $FILE
+echo "Firmware Version:  $DMI_SYSTEM_FIRMWARE_VERSION" >> $FILE
+echo "Board Vendor:      $DMI_BOARD_VENDOR" >> $FILE
+echo "Board Name:        $DMI_BOARD_NAME" >> $FILE
+echo "" >> $FILE
+echo "" >> $FILE
+echo "!!ACPI Device Status Information" >> $FILE
+echo "!!---------------" >> $FILE
+echo "" >> $FILE
+cat $TEMPDIR/acpidevicestatus.tmp >> $FILE
+echo "" >> $FILE
+echo "" >> $FILE
+echo "!!Kernel Information" >> $FILE
+echo "!!------------------" >> $FILE
+echo "" >> $FILE
+echo "Kernel release:    $KERNEL_VERSION" >> $FILE
+echo "Operating System:  $KERNEL_OS" >> $FILE
+echo "Architecture:      $KERNEL_MACHINE" >> $FILE
+echo "Processor:         $KERNEL_PROCESSOR" >> $FILE
+echo "SMP Enabled:       $KERNEL_SMP" >> $FILE
+echo "" >> $FILE
+echo "" >> $FILE
+echo "!!ALSA Version" >> $FILE
+echo "!!------------" >> $FILE
+echo "" >> $FILE
+echo "Driver version:     $ALSA_DRIVER_VERSION" >> $FILE
+echo "Library version:    $ALSA_LIB_VERSION" >> $FILE
+echo "Utilities version:  $ALSA_UTILS_VERSION" >> $FILE
+echo "" >> $FILE
+echo "" >> $FILE
+echo "!!Loaded ALSA modules" >> $FILE
+echo "!!-------------------" >> $FILE
+echo "" >> $FILE
+cat $TEMPDIR/alsamodules.tmp >> $FILE
+echo "" >> $FILE
+echo "" >> $FILE
+echo "!!Sound Servers on this system" >> $FILE
+echo "!!----------------------------" >> $FILE
+echo "" >> $FILE
+if [[ -n $PAINST ]];then
+[[ `pgrep '^(.*/)?pulseaudio$'` ]] && PARUNNING="Yes" || PARUNNING="No"
+echo "Pulseaudio:" >> $FILE
+echo "      Installed - Yes ($PAINST)" >> $FILE
+echo "      Running - $PARUNNING" >> $FILE
+echo "" >> $FILE
+fi
+if [[ -n $ESDINST ]];then
+[[ `pgrep '^(.*/)?esd$'` ]] && ESDRUNNING="Yes" || ESDRUNNING="No"
+echo "ESound Daemon:" >> $FILE
+echo "      Installed - Yes ($ESDINST)" >> $FILE
+echo "      Running - $ESDRUNNING" >> $FILE
+echo "" >> $FILE
+fi
+if [[ -n $ARTSINST ]];then
+[[ `pgrep '^(.*/)?artsd$'` ]] && ARTSRUNNING="Yes" || ARTSRUNNING="No"
+echo "aRts:" >> $FILE
+echo "      Installed - Yes ($ARTSINST)" >> $FILE
+echo "      Running - $ARTSRUNNING" >> $FILE
+echo "" >> $FILE
+fi
+if [[ -n $JACKINST ]];then
+[[ `pgrep '^(.*/)?jackd$'` ]] && JACKRUNNING="Yes" || JACKRUNNING="No"
+echo "Jack:" >> $FILE
+echo "      Installed - Yes ($JACKINST)" >> $FILE
+echo "      Running - $JACKRUNNING" >> $FILE
+echo "" >> $FILE
+fi
+if [[ -n $ROARINST ]];then
+[[ `pgrep '^(.*/)?roard$'` ]] && ROARRUNNING="Yes" || ROARRUNNING="No"
+echo "RoarAudio:" >> $FILE
+echo "      Installed - Yes ($ROARINST)" >> $FILE
+echo "      Running - $ROARRUNNING" >> $FILE
+echo "" >> $FILE
+fi
+if [[ -z "$PAINST" && -z "$ESDINST" && -z "$ARTSINST" && -z "$JACKINST" && -z "$ROARINST" ]];then
+echo "No sound servers found." >> $FILE
+echo "" >> $FILE
+fi
+echo "" >> $FILE
+echo "!!Soundcards recognised by ALSA" >> $FILE
+echo "!!-----------------------------" >> $FILE
+echo "" >> $FILE
+cat $TEMPDIR/alsacards.tmp >> $FILE
+echo "" >> $FILE
+echo "" >> $FILE
+
+if [[ ! -z "$LSPCI" ]]; then
+echo "!!PCI Soundcards installed in the system" >> $FILE
+echo "!!--------------------------------------" >> $FILE
+echo "" >> $FILE
+cat $TEMPDIR/lspci.tmp >> $FILE
+echo "" >> $FILE
+echo "" >> $FILE
+echo "!!Advanced information - PCI Vendor/Device/Subsystem ID's" >> $FILE
+echo "!!-------------------------------------------------------" >> $FILE
+echo "" >> $FILE
+lspci -vvn |grep -A1 040[1-3] >> $FILE
+echo "" >> $FILE
+echo "" >> $FILE
+fi
+
+if [ "$SNDOPTIONS" ]
+then
+echo "!!Modprobe options (Sound related)" >> $FILE
+echo "!!--------------------------------" >> $FILE
+echo "" >> $FILE
+modprobe -c|sed -n 's/^options \(snd[-_][^ ]*\)/\1:/p' >> $FILE
+echo "" >> $FILE
+echo "" >> $FILE
+fi
+
+if [ -d "$SYSFS" ]
+then
+echo "!!Loaded sound module options" >> $FILE
+echo "!!---------------------------" >> $FILE
+echo "" >> $FILE
+for mod in `cat /proc/asound/modules|awk {'print $2'}`;do
+echo "!!Module: $mod" >> $FILE
+for params in `echo $SYSFS/module/$mod/parameters/*`; do
+	echo -ne "\t";
+	echo "$params : `cat $params`" | sed 's:.*/::';
+done >> $FILE
+echo "" >> $FILE
+done
+echo "" >> $FILE
+fi
+
+if [ -s "$TEMPDIR/alsa-hda-intel.tmp" ]; then
+	echo "!!HDA-Intel Codec information" >> $FILE
+	echo "!!---------------------------" >> $FILE
+	echo "--startcollapse--" >> $FILE
+	echo "" >> $FILE
+	cat $TEMPDIR/alsa-hda-intel.tmp >> $FILE
+	echo "--endcollapse--" >> $FILE
+	echo "" >> $FILE
+	echo "" >> $FILE
+fi
+
+if [ -s "$TEMPDIR/alsa-ac97.tmp" ]; then
+        echo "!!AC97 Codec information" >> $FILE
+        echo "!!----------------------" >> $FILE
+        echo "--startcollapse--" >> $FILE
+        echo "" >> $FILE
+        cat $TEMPDIR/alsa-ac97.tmp >> $FILE
+        echo "" >> $FILE
+        cat $TEMPDIR/alsa-ac97-regs.tmp >> $FILE
+        echo "--endcollapse--" >> $FILE
+	echo "" >> $FILE
+	echo "" >> $FILE
+fi
+
+if [ -s "$TEMPDIR/alsa-usbmixer.tmp" ]; then
+        echo "!!USB Mixer information" >> $FILE
+        echo "!!---------------------" >> $FILE
+        echo "--startcollapse--" >> $FILE
+        echo "" >> $FILE
+        cat $TEMPDIR/alsa-usbmixer.tmp >> $FILE
+        echo "--endcollapse--" >> $FILE
+	echo "" >> $FILE
+	echo "" >> $FILE
+fi
+
+#If no command line options are specified, then run as though --with-all was specified
+if [ -z "$1" ]; then
+	update
+	pbcheck	
+fi
+
+fi # proceed
+
+#loop through command line arguments, until none are left.
+if [ -n "$1" ]; then
+	until [ -z "$1" ]
+	do
+	case "$1" in
+		--pastebin)
+		        update
+        		pbcheck
+			;;
+		--update)
+			update
+			exit
+			;;
+		--upload)
+			UPLOAD="yes"
+			;;
+		--no-upload)
+			UPLOAD="no"
+			;;
+		--output)
+			shift
+			NFILE="$1"
+			KEEP_OUTPUT="yes"
+			;;
+		--debug)
+			echo "Debugging enabled. $FILE and $TEMPDIR will not be deleted"
+			KEEP_FILES="yes"
+			echo ""
+			;;
+		--with-all)
+			withall
+			;;
+		--with-aplay)
+			withaplay
+			WITHALL="no"
+			;;
+		--with-amixer)
+			withamixer
+			WITHALL="no"
+			;;
+		--with-alsactl)
+			withalsactl
+			WITHALL="no"
+			;;
+		--with-devices)
+			withdevices
+			WITHALL="no"
+			;;
+		--with-dmesg)
+			withdmesg
+			WITHALL="no"
+			;;
+		--with-configs)
+			WITHALL="no"
+			if [[ -e $HOME/.asoundrc ]] || [[ -e /etc/asound.conf ]]
+			then
+				echo "!!ALSA configuration files" >> $FILE
+				echo "!!------------------------" >> $FILE
+				echo "" >> $FILE
+
+				#Check for ~/.asoundrc
+				if [[ -e $HOME/.asoundrc ]]
+				then
+					echo "!!User specific config file ($HOME/.asoundrc)" >> $FILE
+					echo "" >> $FILE
+					cat $HOME/.asoundrc >> $FILE
+					echo "" >> $FILE
+					echo "" >> $FILE
+				fi
+
+				#Check for /etc/asound.conf
+				if [[ -e /etc/asound.conf ]]
+				then
+					echo "!!System wide config file (/etc/asound.conf)" >> $FILE
+					echo "" >> $FILE
+					cat /etc/asound.conf >> $FILE
+					echo "" >> $FILE
+					echo "" >> $FILE
+				fi
+			fi
+			;;
+		--stdout)
+			UPLOAD="no"
+			if [ -z "$WITHALL" ]; then
+				withall
+			fi
+			cat $FILE
+			rm $FILE
+			;;
+		--about)
+			echo "Written/Tested by the following users of #alsa on irc.freenode.net:"
+			echo ""
+			echo "	wishie - Script author and developer / Testing"
+			echo "	crimsun - Various script ideas / Testing"
+			echo "	gnubien - Various script ideas / Testing"
+			echo "	GrueMaster - HDA Intel specific items / Testing"
+			echo "	olegfink - Script update function"
+			echo "  TheMuso - display to stdout functionality"
+			exit 0
+			;;
+		*)
+			echo "alsa-info.sh version $SCRIPT_VERSION"
+			echo ""
+			echo "Available options:"
+			echo "	--with-aplay (includes the output of aplay -l)"
+			echo "	--with-amixer (includes the output of amixer)"
+			echo "	--with-alsactl (includes the output of alsactl)"
+			echo "	--with-configs (includes the output of ~/.asoundrc and"
+			echo "	    /etc/asound.conf if they exist)" 
+			echo "	--with-devices (shows the device nodes in /dev/snd/)"
+			echo "	--with-dmesg (shows the ALSA/HDA kernel messages)"
+			echo ""
+			echo "	--output FILE (specify the file to output for no-upload mode)"
+			echo "	--update (check server for script updates)"
+			echo "	--upload (upload contents to remote server)"
+			echo "	--no-upload (do not upload contents to remote server)"
+			echo "	--pastebin (use http://pastebin.ca) as remote server"
+			echo "	    instead www.alsa-project.org"
+			echo "	--stdout (print alsa information to standard output"
+			echo "	    instead of a file)"
+			echo "	--about (show some information about the script)"
+			echo "	--debug (will run the script as normal, but will not"
+			echo "	     delete $FILE)"
+			exit 0
+			;;
+	esac
+	shift 1
+	done
+fi
+
+if [ "$PROCEED" = "no" ]; then
+	exit 1
+fi
+
+if [ -z "$WITHALL" ]; then
+	withall
+fi
+
+if [ "$UPLOAD" = "ask" ]; then
+	if [ -n "$DIALOG" ]; then
+		dialog --backtitle "$BGTITLE" --title "Information collected" --yes-label " UPLOAD / SHARE " --no-label " SAVE LOCALLY " --defaultno --yesno "\n\nAutomatically upload ALSA information to $WWWSERVICE?" 10 80
+		DIALOG_EXIT_CODE=$?
+		if [ $DIALOG_EXIT_CODE != 0 ]; then
+			UPLOAD="no"
+		else
+			UPLOAD="yes"
+		fi
+	else
+		echo -n "Automatically upload ALSA information to $WWWSERVICE? [y/N] : "
+		read -e CONFIRM
+		if [ "$CONFIRM" != "y" ]; then
+			UPLOAD="no"
+		else
+			UPLOAD="yes"
+		fi
+	fi
+
+fi
+
+if [ "$UPLOAD" = "no" ]; then
+
+	if [ -z "$TOSTDOUT" ]; then
+		mv -f $FILE $NFILE || exit 1
+		KEEP_OUTPUT="yes"
+	fi
+
+	if [[ -n $DIALOG ]]
+	then
+		if [[ -n $PBERROR ]]; then
+			dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "An error occurred while contacting the $WWWSERVICE.\n Your information was NOT automatically uploaded.\n\nYour ALSA information is in $NFILE" 10 100
+		else
+			dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "\n\nYour ALSA information is in $NFILE" 10 60
+		fi
+	else
+		echo
+
+		if [[ -n $PBERROR ]]; then
+			echo "An error occurred while contacting the $WWWSERVICE."
+			echo "Your information was NOT automatically uploaded."
+			echo ""
+			echo "Your ALSA information is in $NFILE"
+			echo ""
+		else
+			if [ -z "$TOSTDOUT" ]; then
+				echo ""
+				echo "Your ALSA information is in $NFILE"
+				echo ""
+			fi
+		fi
+	fi
+
+	exit
+
+fi # UPLOAD
+
+#Test that wget is installed, and supports --post-file. Upload $FILE if it does, and prompt user to upload file if it doesnt. 
+if [[ -n "${WGET}" ]] && [[ -x "${WGET}" ]] && [[ `wget --help |grep post-file` ]]
+then
+
+if [[ -n $DIALOG ]]
+then
+
+if [[ -z $PASTEBIN ]]; then
+	wget -O - --tries=5 --timeout=60 --post-file=$FILE "http://www.alsa-project.org/cardinfo-db/" &>$TEMPDIR/wget.tmp || echo "Upload failed; exit"
+	{ for i in 10 20 30 40 50 60 70 80 90; do
+		echo $i
+		sleep 0.2
+	done
+	echo; } |dialog --backtitle "$BGTITLE" --guage "Uploading information to www.alsa-project.org ..." 6 70 0
+else
+	wget -O - --tries=5 --timeout=60 --post-file=$FILE "http://pastebin.ca/quiet-paste.php?api=$PASTEBINKEY&encrypt=t&encryptpw=blahblah" &>$TEMPDIR/wget.tmp || echo "Upload failed; exit"
+	{ for i in 10 20 30 40 50 60 70 80 90; do
+		echo $i
+		sleep 0.2
+	done
+	echo; } |dialog --backtitle "$BGTITLE" --guage "Uploading information to www.pastebin.ca ..." 6 70 0
+fi
+
+dialog --backtitle "$BGTITLE" --title "Information uploaded" --yesno "Would you like to see the uploaded information?" 5 100 
+DIALOG_EXIT_CODE=$?
+if [ $DIALOG_EXIT_CODE = 0 ]; then
+	grep -v "alsa-info.txt" $FILE >$TEMPDIR/uploaded.txt
+	dialog --backtitle "$BGTITLE" --textbox $TEMPDIR/uploaded.txt 0 0
+fi
+
+clear
+
+# no dialog
+else
+
+if [[ -z $PASTEBIN ]]; then
+	echo -n "Uploading information to www.alsa-project.org ... " 
+	wget -O - --tries=5 --timeout=60 --post-file=$FILE http://www.alsa-project.org/cardinfo-db/ &>$TEMPDIR/wget.tmp &
+else
+	echo -n "Uploading information to www.pastebin.ca ... " 
+	wget -O - --tries=5 --timeout=60 --post-file=$FILE http://pastebin.ca/quiet-paste.php?api=$PASTEBINKEY &>$TEMPDIR/wget.tmp &
+fi
+
+#Progess spinner for wget transfer.
+i=1
+sp="/-\|"
+echo -n ' '
+while pgrep wget &>/dev/null
+do
+	echo -en "\b${sp:i++%${#sp}:1}"
+done
+
+echo -e "\b Done!"
+echo ""
+
+fi #dialog
+
+#See if tput is available, and use it if it is.	
+if [ -n "$TPUT" ]; then
+	if [[ -z $PASTEBIN ]]; then
+		FINAL_URL=`tput setaf 1; grep "SUCCESS:" $TEMPDIR/wget.tmp | cut -d ' ' -f 2 ; tput sgr0`
+	else
+		FINAL_URL=`tput setaf 1; grep "SUCCESS:" $TEMPDIR/wget.tmp | sed -n 's/.*\:\([0-9]\+\).*/http:\/\/pastebin.ca\/\1/p';tput sgr0`
+	fi
+else
+	if [[ -z $PASTEBIN ]]; then
+		FINAL_URL=`grep "SUCCESS:" $TEMPDIR/wget.tmp | cut -d ' ' -f 2`
+	else
+		FINAL_URL=`grep "SUCCESS:" $TEMPDIR/wget.tmp | sed -n 's/.*\:\([0-9]\+\).*/http:\/\/pastebin.ca\/\1/p'`
+	fi
+fi
+
+# Output the URL of the uploaded file.	
+echo "Your ALSA information is located at $FINAL_URL"
+echo "Please inform the person helping you."
+echo ""
+
+# We couldnt find a suitable wget, so tell the user to upload manually.
+else
+	mv -f $FILE $NFILE || exit 1
+	KEEP_OUTPUT="yes"
+	if [[ -z $DIALOG ]]
+	then
+		if [[ -z $PASTEBIN ]]; then
+		echo ""
+		echo "Could not automatically upload output to http://www.alsa-project.org"
+		echo "Possible reasons are:"
+		echo "    1. Couldnt find 'wget' in your PATH"
+		echo "    2. Your version of wget is less than 1.8.2"
+		echo ""
+		echo "Please manually upload $NFILE to http://www.alsa-project.org/cardinfo-db/ and submit your post."
+		echo ""
+		else
+		echo ""
+		echo "Could not automatically upload output to http://www.pastebin.ca"
+		echo "Possible reasons are:"
+		echo "    1. Couldnt find 'wget' in your PATH"
+		echo "    2. Your version of wget is less than 1.8.2"
+		echo ""
+		echo "Please manually upload $NFILE to http://www.pastebin.ca/upload.php and submit your post."
+		echo ""
+		fi
+	else
+		if [[ -z $PASTEBIN ]]; then
+			dialog --backtitle "$BGTITLE" --msgbox "Could not automatically upload output to http://www.alsa-project.org.\nPossible reasons are:\n\n    1. Couldn't find 'wget' in your PATH\n    2. Your version of wget is less than 1.8.2\n\nPlease manually upload $NFILE to http://www.alsa-project,org/cardinfo-db/ and submit your post." 25 100
+		else
+			dialog --backtitle "$BGTITLE" --msgbox "Could not automatically upload output to http://www.pastebin.ca.\nPossible reasons are:\n\n    1. Couldn't find 'wget' in your PATH\n    2. Your version of wget is less than 1.8.2\n\nPlease manually upload $NFILE to http://www.pastebin.ca/upload.php and submit your post." 25 100
+		fi
+	fi
+fi
--- a/scripts/tests/diag_getFirefox
+++ b/scripts/tests/diag_getFirefox
@ -56,11 +56,11 @@ EOF
 	# si $2=print affiche url testée & entêtes http & location, return 0
 	# si $2=loc affiche seulement location, return 0
 	# si $2=test return 0 si ok, return 1 si KO
-f__wget_test(){		# 5/12/2017
+f__wget_test(){		# 11/12/2017
 	local file_test_wget retourWget retourHttp location

 	file_test_wget="/tmp/testWget-$$-$RANDOM"
-	wget -Sq --timeout=10 --user-agent="$user_agent" --spider --save-headers "$1" &>"$file_test_wget"
+	wget -Sq --timeout=5 --tries=2 --user-agent="$user_agent" --spider --save-headers "$1" &>"$file_test_wget"
 	retourWget="$?"
 	[ "$retourWget" == 1 ] && retourWget="1: code erreur générique"
 	[ "$retourWget" == 2 ] && retourWget="2: parse erreur (ligne de commande?)"
@ -70,8 +70,8 @@ f__wget_test(){		# 5/12/2017
 	[ "$retourWget" == 6 ] && retourWget="6: défaut authentification"
 	[ "$retourWget" == 7 ] && retourWget="7: erreur de protocole"
 	[ "$retourWget" == 8 ] && retourWget="8: réponse serveur en erreur"
-	retourHttp="$( grep -i 'HTTP/' "$file_test_wget" | tr -d '\n' | xargs )"
-	location="$( grep -i 'location' $file_test_wget | xargs )"
+	retourHttp=$( grep -i 'HTTP/' "$file_test_wget" | tr -d '\n' | xargs )
+	location=$( grep -i 'location' $file_test_wget | xargs )
 	if [ "$2" == "test" ]; then
 		rm  "$file_test_wget" 2>/dev/null
 			# spécial maintenance frama.link, pas de redirection sur page status framalink
@ -96,7 +96,8 @@ f__wget_test(){		# 5/12/2017
 	if [ "$retourWget" != "0" ]; then
 		rm  "$file_test_wget" 2>/dev/null
 #		f__error "wget, $retourWget" "$1" "$YELLOW$retourHttp" "$location"
-		echo -e "$RED   erreur wget, $retourWget \n  $1 \n  $YELLOW$retourHttp \n  $location$STD"
+		echo -e "$RED   erreur wget, $retourWget \n  $1 \n  $YELLOW$retourHttp \n  $location$STD" # pour les diags
+		return 1
 	fi
 	if [ "$(grep -c '200' <<< $retourHttp)" -ne 0 ]; then 
 		echo -e "$GREEN\ntout est ok, réessayer$STD\n"
--- a/scripts/tests/diag_getFlashPlayer
+++ b/scripts/tests/diag_getFlashPlayer
@ -22,11 +22,11 @@ f__affichage(){		# v07/09/2017
 	# si $2=print affiche url testée & entêtes http & location, return 0
 	# si $2=loc affiche seulement location, return 0
 	# si $2=test return 0 si ok, return 1 si KO
-f__wget_test(){		# 5/12/2017
+f__wget_test(){		# 11/12/2017
 	local file_test_wget retourWget retourHttp location

 	file_test_wget="/tmp/testWget-$$-$RANDOM"
-	wget -Sq --timeout=10 --user-agent="$user_agent" --spider --save-headers "$1" &>"$file_test_wget"
+	wget -Sq --timeout=5 --tries=2 --user-agent="$user_agent" --spider --save-headers "$1" &>"$file_test_wget"
 	retourWget="$?"
 	[ "$retourWget" == 1 ] && retourWget="1: code erreur générique"
 	[ "$retourWget" == 2 ] && retourWget="2: parse erreur (ligne de commande?)"
@ -36,8 +36,8 @@ f__wget_test(){		# 5/12/2017
 	[ "$retourWget" == 6 ] && retourWget="6: défaut authentification"
 	[ "$retourWget" == 7 ] && retourWget="7: erreur de protocole"
 	[ "$retourWget" == 8 ] && retourWget="8: réponse serveur en erreur"
-	retourHttp="$( grep -i 'HTTP/' "$file_test_wget" | tr -d '\n' | xargs )"
-	location="$( grep -i 'location' $file_test_wget | xargs )"
+	retourHttp=$( grep -i 'HTTP/' "$file_test_wget" | tr -d '\n' | xargs )
+	location=$( grep -i 'location' $file_test_wget | xargs )
 	if [ "$2" == "test" ]; then
 		rm  "$file_test_wget" 2>/dev/null
 			# spécial maintenance frama.link, pas de redirection sur page status framalink
@ -62,7 +62,8 @@ f__wget_test(){		# 5/12/2017
 	if [ "$retourWget" != "0" ]; then
 		rm  "$file_test_wget" 2>/dev/null
 #		f__error "wget, $retourWget" "$1" "$YELLOW$retourHttp" "$location"
-		echo -e "$RED   erreur wget, $retourWget \n  $1 \n  $YELLOW$retourHttp \n  $location$STD"
+		echo -e "$RED   erreur wget, $retourWget \n  $1 \n  $YELLOW$retourHttp \n  $location$STD" # pour les diags
+		return 1
 	fi
 	if [ "$(grep -c '200' <<< $retourHttp)" -ne 0 ]; then 
 		echo -e "$GREEN\ntout est ok, réessayer$STD\n"
--- a/scripts/tests/diag_getThunderbird
+++ b/scripts/tests/diag_getThunderbird
@ -45,11 +45,11 @@ EOF
 	# si $2=print affiche url testée & entêtes http & location, return 0
 	# si $2=loc affiche seulement location, return 0
 	# si $2=test return 0 si ok, return 1 si KO
-f__wget_test(){		# 5/12/2017
+f__wget_test(){		# 11/12/2017
 	local file_test_wget retourWget retourHttp location

 	file_test_wget="/tmp/testWget-$$-$RANDOM"
-	wget -Sq --timeout=10 --user-agent="$user_agent" --spider --save-headers "$1" &>"$file_test_wget"
+	wget -Sq --timeout=5 --tries=2 --user-agent="$user_agent" --spider --save-headers "$1" &>"$file_test_wget"
 	retourWget="$?"
 	[ "$retourWget" == 1 ] && retourWget="1: code erreur générique"
 	[ "$retourWget" == 2 ] && retourWget="2: parse erreur (ligne de commande?)"
@ -59,8 +59,8 @@ f__wget_test(){		# 5/12/2017
 	[ "$retourWget" == 6 ] && retourWget="6: défaut authentification"
 	[ "$retourWget" == 7 ] && retourWget="7: erreur de protocole"
 	[ "$retourWget" == 8 ] && retourWget="8: réponse serveur en erreur"
-	retourHttp="$( grep -i 'HTTP/' "$file_test_wget" | tr -d '\n' | xargs )"
-	location="$( grep -i 'location' $file_test_wget | xargs )"
+	retourHttp=$( grep -i 'HTTP/' "$file_test_wget" | tr -d '\n' | xargs )
+	location=$( grep -i 'location' $file_test_wget | xargs )
 	if [ "$2" == "test" ]; then
 		rm  "$file_test_wget" 2>/dev/null
 			# spécial maintenance frama.link, pas de redirection sur page status framalink
@ -85,7 +85,8 @@ f__wget_test(){		# 5/12/2017
 	if [ "$retourWget" != "0" ]; then
 		rm  "$file_test_wget" 2>/dev/null
 #		f__error "wget, $retourWget" "$1" "$YELLOW$retourHttp" "$location"
-		echo -e "$RED   erreur wget, $retourWget \n  $1 \n  $YELLOW$retourHttp \n  $location$STD"
+		echo -e "$RED   erreur wget, $retourWget \n  $1 \n  $YELLOW$retourHttp \n  $location$STD" # pour les diags
+		return 1
 	fi
 	if [ "$(grep -c '200' <<< $retourHttp)" -ne 0 ]; then 
 		echo -e "$GREEN\ntout est ok, réessayer$STD\n"
--- a/scripts/tests/diag_ip_public
+++ b/scripts/tests/diag_ip_public
@ -1,116 +1,117 @@
 #!/bin/bash

-get_ip_public(){	# $1=IPv4|IPv6, assigne $ip_public
+get_fg_ip_pub(){		#v adapté 11/12/2017
+	local dig_test ip_test

-	list_ip4(){
-		ip_test+=" http://whatismyip.akamai.com"
-		ip_test+=" http://ipof.in/txt"
-		ip_test+=" http://eth0.me"
-		ip_test+=" http://ipecho.net/plain"
-		ip_test+=" http://alma.ch/myip.cgi"
-		ip_test+=" http://checkip.amazonaws.com"
-		ip_test+=" http://eth0.me"
-		ip_test+=" http://ipecho.net/plain"
-		ip_test+=" api.infoip.io/ip"	# http & https
-		ip_test+=" api.ipify.org"		# http & https
-		ip_test+=" ipinfo.io/ip"		# http & https
-	#	ip_test+=" https://4.ifcfg.me"			#down avec wget!
-	}
-	list_ip6(){
-		ip_test+=" http://ipv6.whatismyip.akamai.com"
-		ip_test+=" http://bot.whatismyipaddress.com"
-		ip_test+=" ip.tyk.nu"		# http & https
-		ip_test+=" l2.io/ip"		# http & https
-		ip_test+=" ident.me"		# http & https
-		ip_test+=" icanhazip.com"	# http & https
-		ip_test+=" wgetip.com"		# http & https
-		ip_test+=" https://canhazip.com"
-		ip_test+=" https://tnx.nl/ip"
-	#	ip_test+=" http://smart-ip.net/myip"		#down avec wget?!
-	#	ip_test+=" https://6.ifcfg.me"				#down avec wget?!
-	}
-	list_ip4_dig(){
-		dig_test+=" whoami.akamai.net/@ns1-1.akamaitech.net"
-		dig_test+=" myip.opendns.com/@resolver1.opendns.com"
-		dig_test+=" myip.opendns.com/@resolver2.opendns.com"
-		dig_test+=" myip.opendns.com/@resolver3.opendns.com"
-		dig_test+=" myip.opendns.com/@resolver4.opendns.com"
-	}
-	list_ip6_dig(){
-		dig_test+=" -6/myip.opendns.com/aaaa/@resolver1.ipv6-sandbox.opendns.com"
-		dig_test+=" -6/myip.opendns.com/aaaa/@resolver2.ipv6-sandbox.opendns.com"
+	list_ip4(){		# testé 12/2017
+
+		ip_test=(	# pas de https
+			http://whatismyip.akamai.com
+			http://eth0.me
+			ipinfo.io/ip					# http & https
+			http://alma.ch/myip.cgi			# peu fiable curl
+			http://checkip.amazonaws.com	# peu fiable wget
+			api.infoip.io/ip				# http & https fiable wget
+			api.ipify.org					# http & https fiable wget
+			http://ipecho.net/plain			# peu fiable wget / curl
+		#	http://ipof.in/txt				# fail wget
+		)
 	}

-	unset ip_public
-	local dig_test
-	local ip_test
-	if [ "$1" == "IPv4" ]; then 
+	list_ip4_dig(){		# testé 12/2017
+		dig_test=(
+			whoami.akamai.net/@ns1-1.akamaitech.net
+			myip.opendns.com/@resolver1.opendns.com
+			myip.opendns.com/@resolver2.opendns.com
+			myip.opendns.com/@resolver3.opendns.com
+			myip.opendns.com/@resolver4.opendns.com
+		)
+	}
+
+	list_ip6(){		# testé 12/2017
+		ip_test=(
+			http://ipv6.whatismyip.akamai.com
+			ip.tyk.nu							# http & https
+			wgetip.com							# http & https
+			l2.io/ip							# http & https peu fiable wget
+			icanhazip.com						# http & https peu fiable wget
+			http://bot.whatismyipaddress.com	# peu fiable wget
+			https://canhazip.com				# peu fiable wget
+			https://tnx.nl/ip					# peu fiable wget
+			ident.me							# http & https peu fiable curl
+		)
+	}
+
+	list_ip6_dig(){		# testé 12/2017
+		dig_test=(
+		-6/myip.opendns.com/aaaa/@resolver1.ipv6-sandbox.opendns.com
+		-6/myip.opendns.com/aaaa/@resolver2.ipv6-sandbox.opendns.com
+		)
+	}
+
+	option="$1"
+	unset fg_ip_pub
+		# assignation variables
+	if [ "$1" == "-4" ]; then
+		ping -4 -c1 conncheck.opensuse.org &>/dev/null || ping -4 -c1 free.fr &>/dev/null || return 1	# test connectivité
 		list_ip4_dig
 		list_ip4
 		ip_telnet=4.ifcfg.me
-	elif [ "$1" == "IPv6" ]; then 
+	elif [ "$1" == "-6" ]; then
+		ping -6 -c1 conncheck.opensuse.org &>/dev/null || ping -6 -c1 free.fr &>/dev/null || return 1	# test connectivité
 		list_ip6_dig
 		list_ip6
 		ip_telnet=6.ifcfg.me
-	else return 1; fi
+	fi

-	if which dig &>/dev/null && [ -z "$ip_public" ]; then
-		for ii in $dig_test ; do
-			ip_public=$(dig +short $(sed 's;/; ;g' <<< $ii))
-#			[ "$ip_public" ] && break
-			echo $(sed 's;/; ;g' <<< $ii) $ip_public		# test
+unset fg_ip_pub
+		# DIG
+	if type -p dig &>/dev/null && [ -z "$fg_ip_pub" ]; then
+		for iip in ${dig_test[*]}; do
+			fg_ip_pub=$( dig +short ${iip//\// } )
+echo -e "dig $option $iip \t ${fg_ip_pub:=FAIL}"
+#			[ "$fg_ip_pub" ] && break
 		done
 	fi
-echo "ip dig $ip_public"
-unset ip_public		# test

-	if which wget &>/dev/null && [ -z "$ip_public" ]; then 
-		cmd="wget --quiet --tries=1 --timeout=5 -O - "
-		for ii in $ip_test ; do
-			ip_public=$($cmd $ii)
-#			[ "$ip_public" ] && break
-			echo -e "wget-$ii:\t $ip_public"		# test
+unset fg_ip_pub
+		# WGET
+	if type -p wget &>/dev/null && [ -z "$fg_ip_pub" ]; then 
+		cmd="wget --quiet --timeout=2 --tries=1 -O - "
+		for iip in ${ip_test[*]}; do
+			fg_ip_pub=$( $cmd $iip )
+echo -e "wget $option $iip\t${fg_ip_pub:=FAIL}"
+#			[ "$fg_ip_pub" ] && break
 		done
 	fi
-echo "ip wget $ip_public"
-unset ip_public		# test

-	if which curl &>/dev/null && [ -z "$ip_public" ]; then
-		cmd="curl --silent --location --retry 0 --max-time 5"	#--location pour aider redirections
-		for ii in $ip_test ; do
-			ip_public=$($cmd $ii)
-#			[ "$ip_public" ] && break
-			echo -e "curl-$ii:\t $ip_public"		# test
+unset fg_ip_pub
+		# CURL
+	if type -p curl &>/dev/null && [ -z "$fg_ip_pub" ]; then
+		cmd="curl --silent --location --retry 0 --max-time 5"
+		for iip in ${ip_test[*]}; do
+			fg_ip_pub=$( $cmd $iip )
+echo -e "curl $option $iip \t ${fg_ip_pub:=FAIL}"
+#			[ "$fg_ip_pub" ] && break
 		done
 	fi
-echo "ip curl $ip_public"
-unset ip_public		# test

-	if which telnet &>/dev/null && [ -z "$ip_public" ]; then
-		ip_public=$(telnet $ip_telnet 23 2>/dev/null | grep $1 | cut -d ' ' -f 4)
+unset fg_ip_pub
+		# TELNET
+	if type -p telnet &>/dev/null && [ -z "$fg_ip_pub" ]; then
+		fg_ip_pub=$( telnet $ip_telnet 23 2>/dev/null | grep "Your IPv${option/-}" )
+		fg_ip_pub=${fg_ip_pub##* }
+echo -e "telnet $option $ip_telnet \t ${fg_ip_pub:=FAIL}"
 	fi
-echo "ip telnet $ip_public"
-[ "$1" == "IPv6" ] && ip_temp=$ip_public
-unset ip_public		# test

-	if which nc &>/dev/null && [ -z "$ip_public" ] && [ "$1" != "IPv6" ]; then
-		ip_public=$(nc $ip_telnet 23 2>/dev/null | grep $1 | cut -d ' ' -f 4)
-echo "ip nc $ip_public"
-	fi
-	
-[ "$1" == "IPv6" ] && ip_public=$ip_temp
-
-	if [ -z "$ip_public" ]; then 
-		echo -e "il manque une des commandes suivantes:\n" \
-			"dig / wget / curl / telnet / nc \n" \
-			"ou les ip de test sont devenues défaillantes\n" \
-			"réessayer après avoir installé dig (dnsutils) et wget\n" \
-			"si l'erreur persiste, merci de prévenir $projet $contact" 
+unset fg_ip_pub
+		# NC
+	if type -p nc &>/dev/null && [ -z "$fg_ip_pub" ] && [ "$option" != "-6" ]; then
+		fg_ip_pub=$( nc $ip_telnet 23 2>/dev/null | grep "Your IPv${option/-}" )
+		fg_ip_pub=${fg_ip_pub##* }
+echo -e "nc $option $ip_telnet \t ${fg_ip_pub:=FAIL}"
 	fi
 }

-get_ip_public "IPv4"
-echo "ip4: $ip_public"
-
-get_ip_public "IPv6"
-echo "ip6: $ip_public"
+get_fg_ip_pub "-4"
+get_fg_ip_pub "-6"