From 9be02f047ee414f3424c1c23619efa9eea19ee09 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 6 Apr 2009 20:27:17 +0000 Subject: Use "${awk}", not gawk. /trunk/scripts/build/kernel/linux.sh | 2 1 1 0 +- /trunk/scripts/build/mpfr.sh | 2 1 1 0 +- /trunk/scripts/functions | 4 2 2 0 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh index 5f177d5..7e40fac 100644 --- a/scripts/build/kernel/linux.sh +++ b/scripts/build/kernel/linux.sh @@ -47,7 +47,7 @@ do_kernel_install() { # Only starting with 2.6.18 does headers_install is usable. We only # have 2.6 version available, so only test for sublevel. - k_sublevel=$(gawk '/^SUBLEVEL =/ { print $3 }' "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}/Makefile") + k_sublevel=$("${awk}" '/^SUBLEVEL =/ { print $3 }' "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}/Makefile") [ ${k_sublevel} -ge 18 ] || CT_Abort "Kernel version >= 2.6.18 is needed to install kernel headers." V_OPT="V=${CT_KERNEL_LINUX_VERBOSE_LEVEL}" diff --git a/scripts/build/mpfr.sh b/scripts/build/mpfr.sh index 182c794..2ff3f5b 100644 --- a/scripts/build/mpfr.sh +++ b/scripts/build/mpfr.sh @@ -42,7 +42,7 @@ do_mpfr_extract() { # See: http://sourceware.org/ml/crossgcc/2008-11/msg00046.html # and: http://sourceware.org/ml/crossgcc/2008-11/msg00048.html libtoolize_opt= - case "$(libtoolize --version |head -n 1 |gawk '{ print $(NF); }')" in + case "$(libtoolize --version |head -n 1 |"${awk}" '{ print $(NF); }')" in 0.*) ;; 1.*) ;; *) libtoolize_opt=-i;; diff --git a/scripts/functions b/scripts/functions index 2cdc4d5..c56f5da 100644 --- a/scripts/functions +++ b/scripts/functions @@ -317,7 +317,7 @@ CT_DoSetProxy() { # Find all interfaces and build locally accessible networks server_ip=$(ping -c 1 -W 2 "${CT_PROXY_HOST}" |head -n 1 |sed -r -e 's/^[^\(]+\(([^\)]+)\).*$/\1/;' || true) CT_TestOrAbort "SOCKS proxy '${CT_PROXY_HOST}' has no IP." -n "${server_ip}" - /sbin/ifconfig |gawk -v server_ip="${server_ip}" ' + /sbin/ifconfig |"${awk}" -v server_ip="${server_ip}" ' BEGIN { split( server_ip, tmp, "\\." ); server_ip_num = tmp[1] * 2^24 + tmp[2] * 2^16 + tmp[3] * 2^8 + tmp[4] * 2^0; @@ -845,7 +845,7 @@ CT_DoSaveState() { # We must omit shell functions, and some specific bash variables # that break when restoring the environment, later. We could do # all the processing in the gawk script, but a sed is easier... - set |gawk ' + set |"${awk}" ' BEGIN { _p = 1; } $0~/^[^ ]+ \(\)/ { _p = 0; } _p == 1 -- cgit v0.10.2-6-g49f6