Commit 855fdcae authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

scripts: fix for POSIX compliance 



Using two '=' for string comparison is a bashism.
Revert to using one, as stated in POSIX 1003.1-2008.

Of the three affected scripts, two are explicitly called vi #!/bin/bash.
Those two do not _need_ the fix, but gets it nonetheless, in case we
later switch to a POSIX-compliant shell for those scripts.

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 5c6320f1

scripts/get_linux_config.sh

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ LINUX_MINOR_VERSION=${LINUX26_DIR:13} 


function DBG_PRINT

{

	if [ ${DEBUG} == 1 ] ; then

	if [ ${DEBUG} = 1 ] ; then

		echo $1

	fi

}
@@ -50,8 +50,8 @@ for i in ${CONFIGS} ; do 
	    echo Copying `basename $i`.config ...

	    cp $i.config ${LINUX26_CONFIG}

    elif [ ${THIS_MAJOR} -eq ${LINUX_MAJOR_VERSION} ] ; then

	if [ "${LINUX_MINOR_VERSION}X" == "X" ] ; then

		if [ "${THIS_MINOR}X" == "X" ] ; then

	if [ "${LINUX_MINOR_VERSION}X" = "X" ] ; then

		if [ "${THIS_MINOR}X" = "X" ] ; then

		    echo Copying `basename $i`.config ...

		    cp $i.config ${LINUX26_CONFIG}

		else

scripts/mkpkg

+7 −7
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ function process () 
{

	make $1 >> ${LOG} 2>&1 || test=${FAIL}

	grep "\.tar\." ${LOG} > ${DEPENDENCY}

	if [ ${test} == ${OK} ] ; then

	if [ ${test} = ${OK} ] ; then

		mv ${LOG} ${LOG_OK_FILE}

		printf "%-16s" "OK"

		if [ "${2}X" != "X" ] ; then
@@ -65,29 +65,29 @@ function build_package () 
{

	# echo "BUILD PACKAGE:1=$1 2=$2 3=$3 4=$4 5=$5 6=$6 7=$7"

	printf "mk	%-32s" "$1"

	if [ "$2X" == "X" ] ; then		# no parameters

	if [ "$2X" = "X" ] ; then		# no parameters

		clean_files	$1

		dirclean	$1

		process		$1 "$3"

	elif [ "$2X" == "?X" ] ; then		# no parameters

	elif [ "$2X" = "?X" ] ; then		# no parameters

		clean_files	$1

		dirclean	$1

		process		$1 "$3"

	elif [ "$2X" == "OKX" ] ; then	# Previous build was OK

	elif [ "$2X" = "OKX" ] ; then	# Previous build was OK

		clean_files	$1

		dirclean	$1

		process		$1 "$3"

	elif [ "$2X" == "FAILX" ] ; then

	elif [ "$2X" = "FAILX" ] ; then

		clean_files	$1

		dirclean	$1

		process		$1 "$3"

	elif [ "$2X" == "BROKENX" ] ; then

	elif [ "$2X" = "BROKENX" ] ; then

		printf  "%-16s" "BROKEN"

		if [ "${3}X" != "X" ] ; then

			printf	"%s"	"\"$3\"";

		fi

		echo

	elif [ "$2X" == "DISABLEDX" ] ; then

	elif [ "$2X" = "DISABLEDX" ] ; then

		printf  "%-16s" "DISABLED"

		if [ "${3}X" != "X" ] ; then

			printf	"%s"	"\"$3\"";

scripts/testheader.inc

+8 −8
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ function RESTART() 
function	EXE()

{

	printf 	"EXE	"				| tee -a ${LOGFILE}

	if [ ${active} == 1 ] ; then

	if [ ${active} = 1 ] ; then

		$1 $2 $3 "$4"

		return 0;

	else
@@ -49,10 +49,10 @@ function EXE() 
function	AVR()

{

	printf 	"AVR	"				| tee -a ${LOGFILE}

	if [ "${ARCH}X" == "avr32X" ] ; then

	if [ "${ARCH}X" = "avr32X" ] ; then

		echo "mk $2 UNSUPPORTED \"$4\" $5 $6"	| tee -a ${LOGFILE}

		return 1;

	elif [ ${active} == 1 ] ; then

	elif [ ${active} = 1 ] ; then

		$1 $2 "$3" "$4"

		return 0;

	else
@@ -72,22 +72,22 @@ function skip() 
{

	printf "skip	%-8s" "$1"			| tee -a ${LOGFILE}

	printf "%-32s" "$2"				| tee -a ${LOGFILE}

	if [   "$3X" == "OKX" ] ; then

	if [   "$3X" = "OKX" ] ; then

		printf "%-16s"	"DISABLED"		| tee -a ${LOGFILE}

		if [ "${4}X" != "X" ] ; then

			printf	"%-64s"	"\"$4\""	| tee -a ${LOGFILE}

		fi

	elif [ "$3X" == "FAILX" ] ; then

	elif [ "$3X" = "FAILX" ] ; then

		printf "%-16s"	"DISABLED"		| tee -a ${LOGFILE}

		if [ "${4}X" != "X" ] ; then

			printf	"%-64s"	"\"$4\""	| tee -a ${LOGFILE}

		fi

	elif [ "$3X" == "BROKENX" ] ; then

	elif [ "$3X" = "BROKENX" ] ; then

		printf "%-16s"	"DISABLED"		| tee -a ${LOGFILE}

		if [ "${4}X" != "X" ] ; then

			printf	"%-64s"	"\"$4\""	| tee -a ${LOGFILE}

		fi

	elif [ "$3X" == "DISABLEDX" ] ; then

	elif [ "$3X" = "DISABLEDX" ] ; then

		printf "%-16s"	"DISABLED"		| tee -a ${LOGFILE}

		if [ "${4}X" != "X" ] ; then

			printf	"%-64s"	"\"$4\""	| tee -a ${LOGFILE}
@@ -104,7 +104,7 @@ function skip() 
function bb()

{

	printf 	"%-8s"	"bb"				| tee -a ${LOGFILE}

	if [ ${busybox} == 1 ] ; then

	if [ ${busybox} = 1 ] ; then

		printf "%-8s"	"$1"			| tee -a ${LOGFILE}

		$1 $2 $3 $4 $5 $6

		return 0;