diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/kernel/linux.sh | 2 | ||||
| -rw-r--r-- | scripts/functions | 16 | ||||
| -rwxr-xr-x | scripts/saveSample.sh | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh index 2313c8b..0e95d20 100644 --- a/scripts/build/kernel/linux.sh +++ b/scripts/build/kernel/linux.sh @@ -49,7 +49,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=$(awk '/^SUBLEVEL =/ { print $3 }' "${CT_SRC_DIR}/${CT_KERNEL_FILE}/Makefile") + k_sublevel=$(gawk '/^SUBLEVEL =/ { print $3 }' "${CT_SRC_DIR}/${CT_KERNEL_FILE}/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/functions b/scripts/functions index d69d549..b1db160 100644 --- a/scripts/functions +++ b/scripts/functions @@ -319,7 +319,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 |awk -v server_ip="${server_ip}" ' + /sbin/ifconfig |gawk -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; @@ -751,13 +751,13 @@ CT_DoSaveState() { CT_DoLog DEBUG " Saving environment and aliases" # 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 awk script, but a sed is easier... - set |awk ' - BEGIN { _p = 1; } - $0~/^[^ ]+ \(\)/ { _p = 0; } - _p == 1 - $0 == "}" { _p = 1; } - ' |sed -r -e '/^BASH_(ARGC|ARGV|LINENO|SOURCE|VERSINFO)=/d; + # all the processing in the gawk script, but a sed is easier... + set |gawk ' + BEGIN { _p = 1; } + $0~/^[^ ]+ \(\)/ { _p = 0; } + _p == 1 + $0 == "}" { _p = 1; } + ' |sed -r -e '/^BASH_(ARGC|ARGV|LINENO|SOURCE|VERSINFO)=/d; /^(UID|EUID)=/d; /^(FUNCNAME|GROUPS|PPID|SHELLOPTS)=/d;' >"${state_dir}/env.sh" diff --git a/scripts/saveSample.sh b/scripts/saveSample.sh index b0c5567..5e20e4f 100755 --- a/scripts/saveSample.sh +++ b/scripts/saveSample.sh @@ -59,8 +59,8 @@ sed -r -e 's|^(CT_PREFIX_DIR)=.*|\1="${HOME}/x-tools/${CT_TARGET}"|;' \ CT_DoAddFileToSample() { source="$1" dest="$2" - inode_s=$(ls -i "${source}" |awk '{ print $1; }') - inode_d=$(ls -i "${dest}" 2>/dev/null |awk '{ print $1; }' || true) + inode_s=$(ls -i "${source}" |gawk '{ print $1; }') + inode_d=$(ls -i "${dest}" 2>/dev/null |gawk '{ print $1; }' || true) if [ "${inode_s}" != "${inode_d}" ]; then cp "${source}" "${dest}" fi |