Archives/TheLocehiliosan_yadm
1
0
Fork 0
mirror of https://github.com/TheLocehiliosan/yadm synced 2024-10-27 20:34:27 +00:00
Code Issues Releases Wiki Activity

Automatically prefer gawk over awk

Browse Source
This commit is contained in:
Tim Byrne 2019-12-04 22:18:22 -06:00
parent c0310a43a2
commit 758a2e0c26
No known key found for this signature in database
GPG Key ID: 14DB4FC2465A4B12
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
yadm
View File

@ -40,7 +40,7 @@ FULL_COMMAND=""
GPG_PROGRAM="gpg" GPG_PROGRAM="gpg"
GIT_PROGRAM="git" GIT_PROGRAM="git"
AWK_PROGRAM="${AWK_PROGRAM:-awk}" AWK_PROGRAM=("gawk" "awk")
J2CLI_PROGRAM="j2" J2CLI_PROGRAM="j2"
ENVTPL_PROGRAM="envtpl" ENVTPL_PROGRAM="envtpl"
LSB_RELEASE_PROGRAM="lsb_release" LSB_RELEASE_PROGRAM="lsb_release"
@ -348,7 +348,7 @@ function conditions() {
EOF EOF
) )
"$AWK_PROGRAM" \ "${AWK_PROGRAM[0]}" \
-v class="$local_class" \ -v class="$local_class" \
-v os="$local_system" \ -v os="$local_system" \
-v host="$local_host" \ -v host="$local_host" \
@ -1490,6 +1490,13 @@ function set_operating_system() {
} }
function set_awk() {
local pgm
for pgm in "${AWK_PROGRAM[@]}"; do
command -v "$pgm" >/dev/null 2>&1 && AWK_PROGRAM=("$pgm") && return
done
}
function debug() { function debug() {
[ -n "$DEBUG" ] && echo_e "DEBUG: $*" [ -n "$DEBUG" ] && echo_e "DEBUG: $*"
@ -1802,7 +1809,7 @@ function bootstrap_available() {
return 1 return 1
} }
function awk_available() { function awk_available() {
command -v "$AWK_PROGRAM" >/dev/null 2>&1 && return command -v "${AWK_PROGRAM[0]}" >/dev/null 2>&1 && return
return 1 return 1
} }
function j2cli_available() { function j2cli_available() {
@ -1856,6 +1863,7 @@ function echo_e() {
if [ "$YADM_TEST" != 1 ] ; then if [ "$YADM_TEST" != 1 ] ; then
process_global_args "$@" process_global_args "$@"
set_operating_system set_operating_system
set_awk
set_yadm_dir set_yadm_dir
configure_paths configure_paths
main "${MAIN_ARGS[@]}" main "${MAIN_ARGS[@]}"