1 |
8291
|
aaronmk
|
#!/bin/bash -e
|
2 |
9328
|
aaronmk
|
set -o errexit -o pipefail # errexit in case caller's #! line missing -e
|
3 |
8952
|
aaronmk
|
|
4 |
9018
|
aaronmk
|
if test ! "$_util_sh_include_guard_utils"; then
|
5 |
|
|
_util_sh_include_guard_utils=1
|
6 |
|
|
|
7 |
9798
|
aaronmk
|
isset() { declare -p "$1" &>/dev/null; }
|
8 |
9002
|
aaronmk
|
|
9 |
9074
|
aaronmk
|
realpath() { readlink -f -- "$1"; }
|
10 |
8703
|
aaronmk
|
|
11 |
9314
|
aaronmk
|
str2varname() { echo "${1//[^a-zA-Z0-9_]/_}"; }
|
12 |
8716
|
aaronmk
|
|
13 |
9312
|
aaronmk
|
include_guard_var() { str2varname "$(realpath "$1")"; }
|
14 |
|
|
|
15 |
9074
|
aaronmk
|
self_not_included() # usage: if self_not_included; then ... fi
|
16 |
8703
|
aaronmk
|
{
|
17 |
8971
|
aaronmk
|
test $# -ge 1 || set -- "${BASH_SOURCE[1]}"
|
18 |
8703
|
aaronmk
|
local include_guard="$(include_guard_var "$1")"
|
19 |
8793
|
aaronmk
|
alias self_being_included=false
|
20 |
9003
|
aaronmk
|
! isset "$include_guard" && \
|
21 |
8793
|
aaronmk
|
{ eval "$include_guard"=1; alias self_being_included=true; }
|
22 |
8703
|
aaronmk
|
}
|
23 |
|
|
|
24 |
8793
|
aaronmk
|
# to load newly-defined aliases for use in functions in the same file:
|
25 |
|
|
## fi # load new aliases
|
26 |
|
|
## if self_being_included; then
|
27 |
|
|
# this is needed because aliases defined inside an if statement are not
|
28 |
|
|
# available inside that if statement
|
29 |
|
|
|
30 |
9018
|
aaronmk
|
fi
|
31 |
9017
|
aaronmk
|
|
32 |
9018
|
aaronmk
|
|
33 |
8704
|
aaronmk
|
if self_not_included "${BASH_SOURCE[0]}"; then
|
34 |
|
|
|
35 |
9017
|
aaronmk
|
|
36 |
|
|
#### options
|
37 |
|
|
|
38 |
8709
|
aaronmk
|
shopt -s expand_aliases
|
39 |
|
|
|
40 |
9017
|
aaronmk
|
|
41 |
9789
|
aaronmk
|
#### stubs
|
42 |
|
|
|
43 |
9794
|
aaronmk
|
__caller_indent='log_indent="$log_indent$log_indent_step"'
|
44 |
|
|
alias caller_indent="$__caller_indent"
|
45 |
|
|
alias indent="declare $__caller_indent"
|
46 |
|
|
|
47 |
9789
|
aaronmk
|
function echo_func() { :; }
|
48 |
9790
|
aaronmk
|
alias echo_func='"echo_func" "$FUNCNAME" "$@" && indent || true'
|
49 |
9789
|
aaronmk
|
|
50 |
9796
|
aaronmk
|
function echo_run() { :; }
|
51 |
|
|
alias echo_run='"echo_run" ' # last space alias-expands next word
|
52 |
9789
|
aaronmk
|
|
53 |
10017
|
aaronmk
|
# auto-echo common external commands
|
54 |
10018
|
aaronmk
|
for cmd in env rm which; do alias "$cmd=echo_run $cmd"; done; unset cmd
|
55 |
10017
|
aaronmk
|
|
56 |
10044
|
aaronmk
|
echo_builtin() { :; }
|
57 |
|
|
|
58 |
9797
|
aaronmk
|
function echo_vars() { :; }
|
59 |
9796
|
aaronmk
|
|
60 |
9797
|
aaronmk
|
|
61 |
9226
|
aaronmk
|
#### vars
|
62 |
|
|
|
63 |
|
|
set_var() { eval "$1"'="$2"'; }
|
64 |
|
|
|
65 |
9420
|
aaronmk
|
set_default() { if ! isset "$1"; then set_var "$@"; fi; }
|
66 |
|
|
|
67 |
9226
|
aaronmk
|
set_inv() { set_var no_"$1" "$(test "${!1}" || echo 1)"; }
|
68 |
|
|
|
69 |
|
|
# usage: local var=...; local_inv
|
70 |
10646
|
aaronmk
|
alias local_inv=\
|
71 |
|
|
'declare "no_$var=$(test "${!var}" || echo 1)"; echo_vars no_$var'
|
72 |
9226
|
aaronmk
|
|
73 |
9227
|
aaronmk
|
unexport() { export -n "$@"; }
|
74 |
|
|
# `declare +x` won't work because it defines the var if it isn't set
|
75 |
|
|
|
76 |
9236
|
aaronmk
|
alias local_export='declare -x' # combines effects of local and export
|
77 |
|
|
|
78 |
9226
|
aaronmk
|
get_prefix_vars() { : "${prefix:?}"; eval echo '${!'$prefix'*}'; }
|
79 |
|
|
|
80 |
|
|
# usage: local prefix=..._; import_vars
|
81 |
|
|
# when used inside another alias 2+ levels deep, *must* be run inside a function
|
82 |
|
|
alias import_vars="$(cat <<'EOF'
|
83 |
|
|
: "${prefix:?}"
|
84 |
|
|
declare src_var dest_var
|
85 |
|
|
for src_var in $(get_prefix_vars); do
|
86 |
|
|
dest_var="${src_var#$prefix}"
|
87 |
|
|
declare "$dest_var=${!src_var}"; echo_vars "$dest_var"
|
88 |
|
|
done
|
89 |
|
|
EOF
|
90 |
|
|
)"
|
91 |
|
|
|
92 |
|
|
|
93 |
9311
|
aaronmk
|
#### caching
|
94 |
|
|
|
95 |
|
|
## shell-variable-based caching
|
96 |
|
|
|
97 |
9330
|
aaronmk
|
# usage: local cache_key=...; load_cache; \
|
98 |
9331
|
aaronmk
|
# if ! cached; then save_cache value || return; fi; echo_cached_value
|
99 |
9561
|
aaronmk
|
# cache_key for function inputs: "$(declare -p kw_param...) $*"
|
100 |
9311
|
aaronmk
|
alias load_cache='declare cache_var="$(str2varname "${FUNCNAME}___$cache_key")"'
|
101 |
|
|
alias cached='isset "$cache_var"'
|
102 |
|
|
alias save_cache='set_var "$cache_var"'
|
103 |
|
|
alias echo_cached_value='echo "${!cache_var}"'
|
104 |
|
|
|
105 |
|
|
clear_cache() # usage: func=... clear_cache
|
106 |
|
|
{ : "${func:?}"; unset $(prefix="${func}___" get_prefix_vars); }
|
107 |
|
|
|
108 |
|
|
fi # load new aliases
|
109 |
|
|
if self_being_included; then
|
110 |
|
|
|
111 |
|
|
|
112 |
9017
|
aaronmk
|
#### aliases
|
113 |
|
|
|
114 |
9074
|
aaronmk
|
unalias() { builtin unalias "$@" 2>&- || true; } # no error if undefined
|
115 |
8889
|
aaronmk
|
|
116 |
9191
|
aaronmk
|
# usage: alias alias_='var=value run_cmd '
|
117 |
|
|
function run_cmd() { "$@"; }
|
118 |
|
|
alias run_cmd='"run_cmd" ' # last space alias-expands next word
|
119 |
9017
|
aaronmk
|
|
120 |
9688
|
aaronmk
|
alias_append() { eval $(alias "$1")'"$2"'; } # usage: alias_append alias '; cmd'
|
121 |
9191
|
aaronmk
|
|
122 |
9688
|
aaronmk
|
|
123 |
10045
|
aaronmk
|
#### commands
|
124 |
|
|
|
125 |
10063
|
aaronmk
|
sys_cmd_path() { echo_func; echo_builtin command -p which "$1"|echo_stdout; }
|
126 |
|
|
|
127 |
10045
|
aaronmk
|
# makes command in $1 a system command
|
128 |
|
|
# allows running a system command of the same name as the script
|
129 |
|
|
alias cmd2sys="$(cat <<'EOF'
|
130 |
|
|
declare _1="$1"; shift
|
131 |
10063
|
aaronmk
|
_1="$(indent; clog++ sys_cmd_path "$_1")" || return
|
132 |
10045
|
aaronmk
|
set -- "$_1" "$@"
|
133 |
|
|
EOF
|
134 |
|
|
)"
|
135 |
|
|
|
136 |
|
|
fi # load new aliases
|
137 |
|
|
if self_being_included; then
|
138 |
|
|
|
139 |
|
|
sys_cmd() { cmd2sys; command "$@"; } # usage: sys_cmd cmd... # runs system cmd
|
140 |
|
|
# allows running a system command of the same name as the script
|
141 |
|
|
|
142 |
|
|
|
143 |
9082
|
aaronmk
|
#### functions
|
144 |
|
|
|
145 |
9235
|
aaronmk
|
kw_params() # usage: func() { kw_params param_var...; }; ...; param_var=... cmd
|
146 |
9229
|
aaronmk
|
# removes keyword-param-only vars from the environment
|
147 |
|
|
{ unexport "$@"; }
|
148 |
9228
|
aaronmk
|
|
149 |
9799
|
aaronmk
|
# usage: cmd=... foreach_arg
|
150 |
|
|
function foreach_arg()
|
151 |
|
|
{
|
152 |
9808
|
aaronmk
|
echo_func; kw_params cmd; : "${cmd:?}"
|
153 |
|
|
local a; for a in "$@"; do
|
154 |
9806
|
aaronmk
|
a="$(clog++ echo_run "$cmd" "$a")" || return; args+=("$a")
|
155 |
|
|
done
|
156 |
9799
|
aaronmk
|
echo_vars args
|
157 |
|
|
}
|
158 |
|
|
alias foreach_arg='"foreach_arg" "$@"; set -- "${args[@]}"; unset args'
|
159 |
|
|
|
160 |
10064
|
aaronmk
|
alias self_name='echo "${FUNCNAME%%__*}"' # usage: "$(self_name)"
|
161 |
9082
|
aaronmk
|
|
162 |
10064
|
aaronmk
|
alias self='command "$(self_name)"' # usage: wrapper() { self ...; }
|
163 |
|
|
alias self_sys='sys_cmd "$(self_name)"' # wrapper() { self_sys ...; }
|
164 |
|
|
|
165 |
10648
|
aaronmk
|
pf() { declare -f "$@" >&2; } # usage: pf function # debug-prints func decl
|
166 |
9082
|
aaronmk
|
|
167 |
9677
|
aaronmk
|
all_funcs() # usage: for func in $(all_funcs); do ...; done # all declared funcs
|
168 |
|
|
{ declare -F|while read -r line; do echo -n "${line#declare -f } "; done; }
|
169 |
9673
|
aaronmk
|
|
170 |
9677
|
aaronmk
|
|
171 |
8886
|
aaronmk
|
#### exceptions
|
172 |
|
|
|
173 |
9032
|
aaronmk
|
# usage: cmd || { save_e; ...; rethrow; }
|
174 |
9031
|
aaronmk
|
alias export_e='e=$?'
|
175 |
9032
|
aaronmk
|
alias save_e='declare e=$?'
|
176 |
8976
|
aaronmk
|
alias rethrow='return "$e"'
|
177 |
|
|
alias rethrow_subshell='exit "$e"'
|
178 |
|
|
|
179 |
8978
|
aaronmk
|
fi # load new aliases
|
180 |
|
|
if self_being_included; then
|
181 |
|
|
|
182 |
9535
|
aaronmk
|
# usage: try cmd...; ignore_e status; if catch status; then ...; fi; end_try
|
183 |
8886
|
aaronmk
|
|
184 |
9448
|
aaronmk
|
function try() { e=0; benign_error=1 "$@" || { export_e; true; }; }
|
185 |
9177
|
aaronmk
|
alias try='declare e; "try" ' # last space alias-expands next word
|
186 |
8886
|
aaronmk
|
|
187 |
9534
|
aaronmk
|
catch() { test "$e" -eq "$1" && e=0; }
|
188 |
8886
|
aaronmk
|
|
189 |
9535
|
aaronmk
|
ignore_e() { catch "$@" || true; }
|
190 |
8886
|
aaronmk
|
|
191 |
8977
|
aaronmk
|
alias end_try='rethrow'
|
192 |
|
|
alias end_try_subshell='rethrow_subshell'
|
193 |
8886
|
aaronmk
|
|
194 |
9536
|
aaronmk
|
ignore() { save_e; ignore_e "$@"; rethrow; } # usage: try cmd || ignore status
|
195 |
|
|
|
196 |
9551
|
aaronmk
|
### signals
|
197 |
|
|
|
198 |
|
|
sig_e() { echo $(( 128+$(kill -l "$1") )); } # usage: sig_e SIGINT, etc.
|
199 |
|
|
|
200 |
|
|
ignore_sig() { ignore "$(sig_e "$1")"; }
|
201 |
|
|
|
202 |
9678
|
aaronmk
|
# usage: piped_cmd cmd1...|cmd2... # cmd2 doesn't read all its input
|
203 |
9551
|
aaronmk
|
function piped_cmd() { "$@" || ignore_sig SIGPIPE; }
|
204 |
|
|
alias piped_cmd='"piped_cmd" ' # last space alias-expands next word
|
205 |
|
|
|
206 |
9020
|
aaronmk
|
fi # load new aliases
|
207 |
|
|
if self_being_included; then
|
208 |
9017
|
aaronmk
|
|
209 |
9020
|
aaronmk
|
|
210 |
8899
|
aaronmk
|
#### integers
|
211 |
|
|
|
212 |
9074
|
aaronmk
|
let!() { let "$@" || true; } # always returns true; safe to use for setting
|
213 |
8899
|
aaronmk
|
# "If the last ARG evaluates to 0, let returns 1" (`help let`)
|
214 |
|
|
|
215 |
9074
|
aaronmk
|
bool2int() { try test ! "$1"; echo "$e"; } # empty->0; non-empty->1
|
216 |
9004
|
aaronmk
|
|
217 |
9696
|
aaronmk
|
int2exit() { (( "$1" != 0 )); }
|
218 |
9017
|
aaronmk
|
|
219 |
9697
|
aaronmk
|
exit2bool() { if (( $? == 0 )); then echo 1; fi } # 0->non-empty; !=0->empty
|
220 |
9538
|
aaronmk
|
|
221 |
9697
|
aaronmk
|
|
222 |
9364
|
aaronmk
|
#### floats
|
223 |
|
|
|
224 |
|
|
int_part() { echo "${1%%.*}"; }
|
225 |
|
|
|
226 |
|
|
dec_suffix() { echo "${1#$(int_part "$1")}"; }
|
227 |
|
|
|
228 |
|
|
round_down() { int_part "$1"; }
|
229 |
|
|
|
230 |
|
|
float+int() { echo "$(($(int_part "$1")+$2))$(dec_suffix "$1")"; }
|
231 |
|
|
|
232 |
9544
|
aaronmk
|
float_set_min() { if (($(int_part $1) >= $2)); then echo $1; else echo $2; fi; }
|
233 |
9364
|
aaronmk
|
|
234 |
9544
|
aaronmk
|
|
235 |
9079
|
aaronmk
|
#### strings
|
236 |
|
|
|
237 |
9653
|
aaronmk
|
starts_with() { test "${2#$1}" != "$2"; } # usage: starts_with pattern str
|
238 |
|
|
|
239 |
9711
|
aaronmk
|
match_prefix() # usage: match_prefix pattern str
|
240 |
|
|
{ if starts_with "$1" "$2"; then echo "${2%${2#$1}}"; fi }
|
241 |
|
|
|
242 |
10889
|
aaronmk
|
rm_prefix() { echo "${2#$1}"; } # usage: rm_prefix pattern str
|
243 |
|
|
|
244 |
9081
|
aaronmk
|
repeat() # usage: str=... n=... repeat
|
245 |
|
|
{
|
246 |
9304
|
aaronmk
|
: "${str?}" "${n:?}"; local result= n="$n" # n will be modified in function
|
247 |
|
|
for (( ; n > 0; n-- )); do result="$result$str"; done
|
248 |
|
|
echo "$result"
|
249 |
9081
|
aaronmk
|
}
|
250 |
|
|
|
251 |
10506
|
aaronmk
|
# usage: outer_cmd $sed_cmd ...
|
252 |
10440
|
aaronmk
|
sed_cmd="env LANG= sed -`case "$(uname)" in Darwin) echo El;; *) echo ru;;esac`"
|
253 |
10217
|
aaronmk
|
# LANG: avoid invalid UTF-8 "illegal byte sequence" errors when LANG=*.UTF-8
|
254 |
10440
|
aaronmk
|
# -l: line buffered / -u: unbuffered
|
255 |
10217
|
aaronmk
|
alias sed="$sed_cmd"
|
256 |
|
|
# can't be function because this causes segfault in redir() subshell when
|
257 |
|
|
# used with make.sh make() filter
|
258 |
9079
|
aaronmk
|
|
259 |
9366
|
aaronmk
|
fi # load new aliases
|
260 |
|
|
if self_being_included; then
|
261 |
9079
|
aaronmk
|
|
262 |
9425
|
aaronmk
|
rtrim() { log+ 3; sed 's/[[:space:]]+$//' <<<"$1"; }
|
263 |
9079
|
aaronmk
|
|
264 |
9085
|
aaronmk
|
|
265 |
8854
|
aaronmk
|
#### arrays
|
266 |
8694
|
aaronmk
|
|
267 |
9938
|
aaronmk
|
echo1() { echo "$1"; } # usage: echo1 values...
|
268 |
|
|
|
269 |
10019
|
aaronmk
|
# usage: split delim str; use ${parts[@]}
|
270 |
|
|
function split() { echo_func; local IFS="$1"; parts=($2); echo_vars parts; }
|
271 |
|
|
alias split='declare parts; "split"'
|
272 |
|
|
|
273 |
10821
|
aaronmk
|
join() { local IFS="$delim"; echo "$*"; } # usage: delim=char join elems...
|
274 |
8816
|
aaronmk
|
|
275 |
9074
|
aaronmk
|
reverse() # usage: array=($(reverse args...))
|
276 |
8691
|
aaronmk
|
{
|
277 |
|
|
local i
|
278 |
9080
|
aaronmk
|
for (( i=$#; i > 0; i-- )); do printf '%q ' "${!i}"; done
|
279 |
8691
|
aaronmk
|
}
|
280 |
|
|
|
281 |
9097
|
aaronmk
|
contains() # usage: contains value in_array...
|
282 |
|
|
{
|
283 |
|
|
local value="$1"; shift
|
284 |
|
|
local elem
|
285 |
|
|
for elem in "$@"; do if test "$elem" = "$value"; then return 0; fi; done
|
286 |
|
|
return 1
|
287 |
|
|
}
|
288 |
9017
|
aaronmk
|
|
289 |
10822
|
aaronmk
|
is_array() # handles unset vars (=false)
|
290 |
10400
|
aaronmk
|
{
|
291 |
10822
|
aaronmk
|
isset "$1" || return 1
|
292 |
10400
|
aaronmk
|
local decl; decl="$(declare -p "$1")" || return; echo_vars decl
|
293 |
|
|
starts_with 'declare -a' "$decl" # also matches -ax
|
294 |
|
|
}
|
295 |
|
|
|
296 |
9715
|
aaronmk
|
#### streams
|
297 |
9097
|
aaronmk
|
|
298 |
9715
|
aaronmk
|
pipe_delay() # usage: cmd1 | { pipe_delay; cmd2; }
|
299 |
|
|
{ sleep 0.1; } # s; display after leading output of cmd1
|
300 |
|
|
|
301 |
|
|
|
302 |
8854
|
aaronmk
|
#### verbose output
|
303 |
|
|
|
304 |
9110
|
aaronmk
|
|
305 |
9208
|
aaronmk
|
err_fd=2 # stderr
|
306 |
|
|
|
307 |
9111
|
aaronmk
|
usage() { echo "Usage: $1" >&2; return 2; }
|
308 |
9110
|
aaronmk
|
|
309 |
|
|
|
310 |
9452
|
aaronmk
|
### log++
|
311 |
9110
|
aaronmk
|
|
312 |
9361
|
aaronmk
|
log_fd=2 # initially stderr
|
313 |
9209
|
aaronmk
|
|
314 |
9142
|
aaronmk
|
if test "$explicit_errors_only"; then verbosity=0; fi # hide startup logging
|
315 |
|
|
|
316 |
9006
|
aaronmk
|
# set verbosity
|
317 |
9005
|
aaronmk
|
if isset verbose; then : "${verbosity:=$(bool2int "$verbose")}"; fi
|
318 |
9145
|
aaronmk
|
if isset vb; then : "${verbosity:=$vb}"; fi
|
319 |
9272
|
aaronmk
|
: "${verbosity=1}" # default
|
320 |
9006
|
aaronmk
|
: "${verbosity:=0}" # ensure non-empty
|
321 |
9119
|
aaronmk
|
export verbosity # propagate to invoked commands
|
322 |
9381
|
aaronmk
|
export PS4 # follows verbosity, so also propagate this
|
323 |
8710
|
aaronmk
|
|
324 |
9731
|
aaronmk
|
is_outermost="$(! isset log_level; exit2bool)" # if util.sh env not yet set up
|
325 |
|
|
|
326 |
9542
|
aaronmk
|
# set log_level
|
327 |
|
|
: "${log_level=$(( ${#PS4}-1 ))}" # defaults to # non-space symbols in PS4
|
328 |
|
|
export log_level # propagate to invoked commands
|
329 |
|
|
|
330 |
9396
|
aaronmk
|
verbosity_int() { round_down "$verbosity"; }
|
331 |
|
|
|
332 |
9450
|
aaronmk
|
# verbosities (and `make` equivalents):
|
333 |
9359
|
aaronmk
|
# 0: just print errors. useful for cron jobs.
|
334 |
9451
|
aaronmk
|
# vs. make: equivalent to --silent, but suppresses external command output
|
335 |
9359
|
aaronmk
|
# 1: also external commands run. useful for running at the command line.
|
336 |
9450
|
aaronmk
|
# vs. make: not provided (but sorely needed to avoid excessive output)
|
337 |
9359
|
aaronmk
|
# 2: full graphical call tree. useful for determining where error occurred.
|
338 |
9450
|
aaronmk
|
# vs. make: equivalent to default verbosity, but with much-needed indents
|
339 |
9360
|
aaronmk
|
# 3: also values of kw params and variables. useful for low-level debugging.
|
340 |
9450
|
aaronmk
|
# vs. make: not provided; need to manually use $(error $(var))
|
341 |
9359
|
aaronmk
|
# 4: also variables in util.sh commands. useful for debugging util.sh.
|
342 |
9450
|
aaronmk
|
# vs. make: somewhat similar to --print-data-base
|
343 |
9359
|
aaronmk
|
# 5: also variables in logging commands themselves. useful for debugging echo_*.
|
344 |
9450
|
aaronmk
|
# vs. make: not provided; need to search Makefile for @ at beginning of cmd
|
345 |
9359
|
aaronmk
|
# 6+: not currently used (i.e. same as 5)
|
346 |
|
|
|
347 |
9287
|
aaronmk
|
# definition: the log_level is the minimum verbosity needed to display a message
|
348 |
|
|
# for messages that use can_log(), the log_level starts with *1*, not 0
|
349 |
|
|
# for unfiltered messages, the log_level is 0 (i.e. still output at verbosity=0)
|
350 |
9288
|
aaronmk
|
# to view a message's log_level, count the # of + signs before it in the output
|
351 |
9284
|
aaronmk
|
|
352 |
9305
|
aaronmk
|
fi # load new aliases
|
353 |
|
|
if self_being_included; then
|
354 |
|
|
|
355 |
9299
|
aaronmk
|
# usage: in func: log++; ... OR log_local; "log++"; ...
|
356 |
9176
|
aaronmk
|
# outside func: log++; ...; log--
|
357 |
9720
|
aaronmk
|
# before cmd: "log++" cmd OR "log+" # cmd OR "log++" "log++" cmd
|
358 |
9716
|
aaronmk
|
# with a cmd, assignments are applied just to it, so log_local is not needed
|
359 |
9302
|
aaronmk
|
# without a cmd, "$@" expands to nothing and assignments are applied to caller
|
360 |
9305
|
aaronmk
|
# "${@:2}" expands to all of $@ after *1st* arg, not 2nd ($@ indexes start at 1)
|
361 |
9373
|
aaronmk
|
log+()
|
362 |
|
|
{
|
363 |
|
|
# no local vars because w/o cmd, assignments should be applied to caller
|
364 |
9545
|
aaronmk
|
PS4="$(str="${PS4:0:1}" n=$((log_level+$1-1)) repeat)${PS4: -2}"; \
|
365 |
9543
|
aaronmk
|
log_level=$((log_level+$1)) \
|
366 |
9377
|
aaronmk
|
verbosity="$(float+int "$verbosity" "-$1")" "${@:2}"
|
367 |
9373
|
aaronmk
|
}
|
368 |
10153
|
aaronmk
|
log-() { log+ "-$1" "${@:2}"; }
|
369 |
10154
|
aaronmk
|
log++() { log+ 1 "$@"; }
|
370 |
|
|
log--() { log- 1 "$@"; }
|
371 |
9542
|
aaronmk
|
alias log_local=\
|
372 |
|
|
'declare PS4="$PS4" log_level="$log_level" verbosity="$verbosity"'
|
373 |
9395
|
aaronmk
|
alias log+='log_local; "log+"' # don't expand next word because it's not a cmd
|
374 |
9301
|
aaronmk
|
alias log++='log_local; "log++" ' # last space alias-expands next word
|
375 |
|
|
alias log--='log_local; "log--" ' # last space alias-expands next word
|
376 |
9751
|
aaronmk
|
# no clog+ alias because next word is not a cmd
|
377 |
|
|
alias clog++='"log++" ' # last space alias-expands next word
|
378 |
|
|
alias clog--='"log--" ' # last space alias-expands next word
|
379 |
9176
|
aaronmk
|
|
380 |
9846
|
aaronmk
|
verbosity_min() # usage: verbosity_min {min|} # ''->verbosity=''
|
381 |
|
|
{ if test ! "$1" -o "$(verbosity_int)" -lt "$1"; then verbosity="$1"; fi; }
|
382 |
9397
|
aaronmk
|
alias verbosity_min='log_local; "verbosity_min"'
|
383 |
9289
|
aaronmk
|
|
384 |
9878
|
aaronmk
|
# usage: (verbosity_compat; cmd)
|
385 |
9867
|
aaronmk
|
function verbosity_compat()
|
386 |
9878
|
aaronmk
|
{ echo_func; if ((verbosity == 1)); then unset verbosity; fi; }
|
387 |
9867
|
aaronmk
|
alias verbosity_compat='declare verbosity; "verbosity_compat"'
|
388 |
9397
|
aaronmk
|
|
389 |
9867
|
aaronmk
|
|
390 |
9289
|
aaronmk
|
# indent for call tree. this is *not* the log_level (below).
|
391 |
9382
|
aaronmk
|
: "${log_indent_step=| }" "${log_indent=}"
|
392 |
|
|
export log_indent_step log_indent # propagate to invoked commands
|
393 |
9289
|
aaronmk
|
|
394 |
9794
|
aaronmk
|
# see indent alias in stubs
|
395 |
9289
|
aaronmk
|
|
396 |
|
|
|
397 |
9190
|
aaronmk
|
fi # load new aliases
|
398 |
|
|
if self_being_included; then
|
399 |
|
|
|
400 |
9396
|
aaronmk
|
can_log() { test "$(verbosity_int)" -gt 0; }
|
401 |
9380
|
aaronmk
|
# verbosity=0 turns off all logging
|
402 |
8895
|
aaronmk
|
|
403 |
9212
|
aaronmk
|
log() { if can_log; then echo "$log_indent$PS4$1" >&"$log_fd"; fi; }
|
404 |
9064
|
aaronmk
|
|
405 |
9270
|
aaronmk
|
log_custom() # usage: symbol=... log_custom msg
|
406 |
9242
|
aaronmk
|
{ log_indent="${log_indent//[^ ]/$symbol}" PS4="${PS4//[^ ]/$symbol}" log "$@";}
|
407 |
9070
|
aaronmk
|
|
408 |
9251
|
aaronmk
|
log_err() { symbol='#' verbosity=1 log_fd="$err_fd" log_custom "$@"; }
|
409 |
9070
|
aaronmk
|
|
410 |
9250
|
aaronmk
|
log_info() { symbol=: log_custom "$@"; }
|
411 |
9070
|
aaronmk
|
|
412 |
9678
|
aaronmk
|
die() # usage: cmd || [type=...] die msg # msg can use $? but not $()
|
413 |
9270
|
aaronmk
|
{ save_e; kw_params type; "log_${type:-err}" "$1"; rethrow; }
|
414 |
9069
|
aaronmk
|
|
415 |
9447
|
aaronmk
|
die_e() # usage: cmd || [benign_error=1] die_e [|| handle error]
|
416 |
|
|
{
|
417 |
|
|
save_e; kw_params benign_error
|
418 |
9449
|
aaronmk
|
if test "$benign_error"; then log++; fi
|
419 |
9447
|
aaronmk
|
type="${benign_error:+info}" die "command exited with \
|
420 |
|
|
$(if test "$benign_error"; then echo status; else echo error; fi) $e"
|
421 |
|
|
rethrow
|
422 |
|
|
}
|
423 |
8919
|
aaronmk
|
|
424 |
9437
|
aaronmk
|
|
425 |
9233
|
aaronmk
|
#### functions
|
426 |
|
|
|
427 |
|
|
func_exists() { declare -f "$1" >/dev/null; }
|
428 |
|
|
|
429 |
|
|
copy_func() # usage: from=... to=... copy_func
|
430 |
|
|
# $to must not exist. to get around the no-clobber restriction, use `unset -f`.
|
431 |
|
|
{
|
432 |
|
|
: "${from:?}" "${to:?}"
|
433 |
|
|
func_exists "$from" || die "function does not exist: $from"
|
434 |
|
|
! func_exists "$to" || die "function already exists: $to"
|
435 |
|
|
local from_def="$(declare -f "$from")"
|
436 |
|
|
eval "$to${from_def#$from}"
|
437 |
|
|
}
|
438 |
|
|
|
439 |
|
|
func_override() # usage: func_override old_name__suffix
|
440 |
9559
|
aaronmk
|
{ from="${1%__*}" to="$1" copy_func; }
|
441 |
9233
|
aaronmk
|
|
442 |
|
|
ensure_nested_func() # usage: func__nested_func() { ensure_nested_func; ... }
|
443 |
|
|
{
|
444 |
|
|
local nested_func="${FUNCNAME[1]}"
|
445 |
|
|
local func="${nested_func%%__*}"
|
446 |
|
|
contains "$func" "${FUNCNAME[@]}" || \
|
447 |
|
|
die "$nested_func() must be used by $func()"
|
448 |
|
|
}
|
449 |
|
|
|
450 |
|
|
|
451 |
9240
|
aaronmk
|
#### paths
|
452 |
|
|
|
453 |
9313
|
aaronmk
|
# cache realpath
|
454 |
|
|
: "${realpath_cache=}" # default off because slower than without
|
455 |
|
|
if test "$realpath_cache"; then
|
456 |
|
|
func_override realpath__no_cache
|
457 |
|
|
realpath() # caches the last result for efficiency
|
458 |
|
|
{
|
459 |
|
|
local cache_key="$*"; load_cache
|
460 |
9331
|
aaronmk
|
if ! cached; then save_cache "$(realpath__no_cache "$@")" || return; fi
|
461 |
9313
|
aaronmk
|
echo_cached_value
|
462 |
|
|
}
|
463 |
|
|
fi
|
464 |
|
|
|
465 |
9244
|
aaronmk
|
rel_path() # usage: base_dir=... path=... rel_path
|
466 |
9240
|
aaronmk
|
{
|
467 |
9788
|
aaronmk
|
kw_params base_dir path
|
468 |
9244
|
aaronmk
|
: "${base_dir:?}" "${path:?}"
|
469 |
|
|
|
470 |
9246
|
aaronmk
|
local path="$path/" # add *extra* / to match path when exactly = base_dir
|
471 |
|
|
path="${path#$base_dir/}" # remove prefix shared with base_dir
|
472 |
|
|
path="${path%/}" # remove any remaining extra trailing /
|
473 |
9244
|
aaronmk
|
|
474 |
9245
|
aaronmk
|
if test ! "$path"; then path=.; fi # ensure non-empty
|
475 |
|
|
|
476 |
9244
|
aaronmk
|
echo_vars path
|
477 |
9240
|
aaronmk
|
echo "$path"
|
478 |
|
|
}
|
479 |
|
|
|
480 |
9309
|
aaronmk
|
cd -P . # expand symlinks in $PWD so it matches the output of realpath
|
481 |
|
|
# do before setting $top_script_abs so realpath has less symlinks to resolve
|
482 |
|
|
|
483 |
9791
|
aaronmk
|
canon_rel_path() # usage: [base_dir=...] canon_rel_path path
|
484 |
9331
|
aaronmk
|
{
|
485 |
9791
|
aaronmk
|
kw_params base_dir; local base_dir="${base_dir-$PWD}"
|
486 |
|
|
base_dir="$(realpath "$base_dir")" || return
|
487 |
9331
|
aaronmk
|
local path; path="$(realpath "$1")" || return
|
488 |
9791
|
aaronmk
|
rel_path
|
489 |
9331
|
aaronmk
|
}
|
490 |
9244
|
aaronmk
|
|
491 |
10143
|
aaronmk
|
canon_dir_rel_path() # usage: [base_dir=...] canon_dir_rel_path path
|
492 |
|
|
# if the path is a symlink, just its parent dir will be canonicalized
|
493 |
|
|
{
|
494 |
|
|
kw_params base_dir; local base_dir="${base_dir-$PWD}"
|
495 |
|
|
base_dir="$(realpath "$base_dir")" || return
|
496 |
|
|
local path; path="$(realpath "$(dirname "$1")")/$(basename "$1")" || return
|
497 |
|
|
rel_path
|
498 |
|
|
}
|
499 |
|
|
|
500 |
9240
|
aaronmk
|
# makes $1 a canon_rel_path if it's a filesystem path
|
501 |
|
|
alias cmd2rel_path="$(cat <<'EOF'
|
502 |
|
|
if test "$(type -t "$1")" = file && test -e "$1"; then # not relative to PATH
|
503 |
|
|
declare _1="$1"; shift
|
504 |
9788
|
aaronmk
|
_1="$(clog++ canon_rel_path "$_1")" || return
|
505 |
9331
|
aaronmk
|
set -- "$_1" "$@"
|
506 |
9240
|
aaronmk
|
fi
|
507 |
|
|
EOF
|
508 |
|
|
)"
|
509 |
|
|
|
510 |
9810
|
aaronmk
|
# usage: path_parents path; use ${dirs[@]} # includes the path itself
|
511 |
|
|
function path_parents()
|
512 |
|
|
{
|
513 |
|
|
echo_func; local path="$1" prev_path=; dirs=()
|
514 |
|
|
while test "$path" != "$prev_path"; do
|
515 |
|
|
prev_path="$path"
|
516 |
|
|
dirs+=("$path")
|
517 |
|
|
path="${path%/*}"
|
518 |
|
|
done
|
519 |
|
|
}
|
520 |
|
|
alias path_parents='declare dirs; "path_parents"'
|
521 |
9240
|
aaronmk
|
|
522 |
9810
|
aaronmk
|
|
523 |
9240
|
aaronmk
|
#### verbose output
|
524 |
|
|
|
525 |
|
|
|
526 |
9165
|
aaronmk
|
### command echoing
|
527 |
|
|
|
528 |
|
|
alias echo_params='log "$*"'
|
529 |
|
|
|
530 |
8995
|
aaronmk
|
fi # load new aliases
|
531 |
|
|
if self_being_included; then
|
532 |
|
|
|
533 |
9197
|
aaronmk
|
echo_cmd() { echo_params; }
|
534 |
9056
|
aaronmk
|
|
535 |
9549
|
aaronmk
|
function echo_run() { echo_params; "$@"; }
|
536 |
9796
|
aaronmk
|
# see echo_run alias after stub
|
537 |
9539
|
aaronmk
|
|
538 |
10044
|
aaronmk
|
echo_builtin() { echo_run builtin "$@"; } # usage: echo_builtin builtin_cmd...
|
539 |
|
|
|
540 |
9278
|
aaronmk
|
echo_eval() { echo_params; builtin eval "$@"; }
|
541 |
|
|
|
542 |
9730
|
aaronmk
|
# usage: redirs=(...); [cmd_name_log_inc=#] echo_redirs_cmd
|
543 |
9655
|
aaronmk
|
function echo_redirs_cmd()
|
544 |
|
|
{
|
545 |
9730
|
aaronmk
|
local cmd_name_log_inc="${cmd_name_log_inc-0}"
|
546 |
|
|
|
547 |
9657
|
aaronmk
|
# print <>file redirs before cmd, because they introduce it
|
548 |
9730
|
aaronmk
|
"log+" "$cmd_name_log_inc" echo_cmd "$@" $(
|
549 |
9809
|
aaronmk
|
set -- "${redirs[@]}" # operate on ${redirs[@]}
|
550 |
9657
|
aaronmk
|
while test "$#" -gt 0 && starts_with '[<>][^&]' "$1"
|
551 |
|
|
do log "$1 \\"; shift; done # log() will run *before* echo_cmd itself
|
552 |
|
|
echo "$@"
|
553 |
9655
|
aaronmk
|
)
|
554 |
|
|
}
|
555 |
|
|
alias echo_redirs_cmd='"echo_redirs_cmd" "$@"'
|
556 |
|
|
|
557 |
9263
|
aaronmk
|
## vars
|
558 |
|
|
|
559 |
10647
|
aaronmk
|
echo_vars() # usage: echo_vars var... # only prints vars that are defined
|
560 |
9263
|
aaronmk
|
{
|
561 |
9320
|
aaronmk
|
log+ 2
|
562 |
9263
|
aaronmk
|
if can_log; then
|
563 |
|
|
local var
|
564 |
|
|
for var in "${@%%=*}"; do
|
565 |
|
|
if isset "$var"; then log "$(declare -p "$var")"; fi
|
566 |
|
|
done
|
567 |
|
|
fi
|
568 |
|
|
}
|
569 |
|
|
|
570 |
|
|
echo_export() { builtin export "$@"; echo_vars "$@"; }
|
571 |
|
|
|
572 |
9379
|
aaronmk
|
alias export="echo_export" # automatically echo env vars when they are set
|
573 |
9263
|
aaronmk
|
|
574 |
|
|
func_override kw_params__lang
|
575 |
|
|
kw_params() { kw_params__lang "$@"; echo_vars "$@"; } # echo all keyword params
|
576 |
|
|
|
577 |
9273
|
aaronmk
|
## functions
|
578 |
9264
|
aaronmk
|
|
579 |
9315
|
aaronmk
|
# usage: local func=...; set_func_loc; use $file, $line
|
580 |
|
|
alias set_func_loc="$(cat <<'EOF'
|
581 |
|
|
: "${func:?}"
|
582 |
|
|
local func_info="$(shopt -s extdebug; declare -F "$func")" # 'func line file'
|
583 |
|
|
func_info="${func_info#$func }"
|
584 |
|
|
local line="${func_info%% *}"
|
585 |
|
|
local file="${func_info#$line }"
|
586 |
|
|
EOF
|
587 |
|
|
)"
|
588 |
|
|
|
589 |
|
|
fi # load new aliases
|
590 |
|
|
if self_being_included; then
|
591 |
|
|
|
592 |
|
|
func_loc() # gets where function declared in the format file:line
|
593 |
9331
|
aaronmk
|
{
|
594 |
|
|
local func="$1"; set_func_loc
|
595 |
|
|
file="$(canon_rel_path "$file")" || return
|
596 |
|
|
echo "$file:$line"
|
597 |
|
|
}
|
598 |
9315
|
aaronmk
|
|
599 |
9273
|
aaronmk
|
# usage: func() { [minor=1] echo_func; ... }
|
600 |
9317
|
aaronmk
|
function echo_func()
|
601 |
9871
|
aaronmk
|
# usage: "echo_func" "$FUNCNAME" "$@" && indent || true
|
602 |
9273
|
aaronmk
|
# exit status: whether function call was echoed
|
603 |
|
|
{
|
604 |
9872
|
aaronmk
|
log++; can_log || return
|
605 |
9317
|
aaronmk
|
local func="$1"; shift
|
606 |
9788
|
aaronmk
|
local loc; loc="$(clog++ func_loc "$func")" || return
|
607 |
9331
|
aaronmk
|
echo_cmd "$loc" "$func" "$@"
|
608 |
9273
|
aaronmk
|
}
|
609 |
9790
|
aaronmk
|
# see echo_func alias after stub
|
610 |
9273
|
aaronmk
|
|
611 |
9276
|
aaronmk
|
fi # load new aliases
|
612 |
|
|
if self_being_included; then
|
613 |
9273
|
aaronmk
|
|
614 |
9276
|
aaronmk
|
|
615 |
9279
|
aaronmk
|
#### streams
|
616 |
|
|
|
617 |
|
|
fd_exists() { (: <&"$1") 2>/dev/null; }
|
618 |
|
|
|
619 |
|
|
require_fd_not_exists() # usage: require_fd_not_exists fd || return 0
|
620 |
|
|
{ ! fd_exists "$1" || type=info die "fd $1 already exists, skipping"; }
|
621 |
|
|
|
622 |
9712
|
aaronmk
|
set_fds() # usage: set_fds redirect...
|
623 |
10772
|
aaronmk
|
# WARNING: does not currently support redirecting an fd to itself (due to bash
|
624 |
|
|
# bug that requires the dest fd to be closed before it can be reopened)
|
625 |
9712
|
aaronmk
|
{
|
626 |
|
|
echo_func
|
627 |
|
|
|
628 |
|
|
# add #<>&- before every #<>&# reopen to fix strange bash bug
|
629 |
9804
|
aaronmk
|
local redirs=() i
|
630 |
9712
|
aaronmk
|
for i in "$@"; do
|
631 |
9713
|
aaronmk
|
local redir_prefix="$(match_prefix '*[<>]' "$i")"
|
632 |
10890
|
aaronmk
|
local dest="$( rm_prefix '*[<>]' "$i")"
|
633 |
|
|
if ! starts_with '&' "$dest"; then # escape dest
|
634 |
|
|
i="$redir_prefix$(printf %q "$dest")"
|
635 |
|
|
fi
|
636 |
9712
|
aaronmk
|
if test "$redir_prefix"; then redirs+=("$redir_prefix&-"); fi
|
637 |
10773
|
aaronmk
|
# remove empty redirects resulting from using `redirs= cmd...` to clear
|
638 |
|
|
# the redirs and then using $redirs as an array
|
639 |
|
|
if test "$i"; then redirs+=("$i"); fi
|
640 |
9712
|
aaronmk
|
done
|
641 |
|
|
set -- "${redirs[@]}"
|
642 |
|
|
|
643 |
9795
|
aaronmk
|
if (($# > 0)); then echo_eval exec "$@"; fi
|
644 |
9712
|
aaronmk
|
}
|
645 |
9279
|
aaronmk
|
|
646 |
|
|
fd_set_default() # usage: fd_set_default 'dest[<>]src'
|
647 |
|
|
{
|
648 |
|
|
echo_func
|
649 |
|
|
local dest="${1%%[<>]*}"
|
650 |
|
|
require_fd_not_exists "$dest" || return 0
|
651 |
|
|
set_fds "$1"
|
652 |
|
|
}
|
653 |
|
|
|
654 |
10770
|
aaronmk
|
stdout2fd() # usage: fd=# stdout2fd cmd...
|
655 |
|
|
{
|
656 |
|
|
echo_func; kw_params fd; : "${fd?}"
|
657 |
10771
|
aaronmk
|
if test "$fd" != 1; then local redirs=(">&$fd" "${redirs[@]}"); fi
|
658 |
10770
|
aaronmk
|
redir "$@"
|
659 |
|
|
}
|
660 |
|
|
|
661 |
10768
|
aaronmk
|
function filter_fd() # usage: (fd=# [redirs=] filter_fd filter_cmd...; \
|
662 |
|
|
# with filter...) # be sure ${redirs[@]} is not set to an outer value
|
663 |
9717
|
aaronmk
|
# useful e.g. to filter logging output or highlight errors
|
664 |
|
|
{
|
665 |
|
|
echo_func; kw_params fd; : "${fd?}"
|
666 |
10770
|
aaronmk
|
set_fds "$fd>" >(pipe_delay; stdout2fd "$@")
|
667 |
9717
|
aaronmk
|
pipe_delay; pipe_delay # wait for >()'s pipe_delay and initial logging
|
668 |
|
|
}
|
669 |
9728
|
aaronmk
|
alias filter_fd='"filter_fd" ' # last space alias-expands next word
|
670 |
9717
|
aaronmk
|
|
671 |
9651
|
aaronmk
|
# convention: use fd 40/41/42 for command-specific alternate stdin/stdout/stderr
|
672 |
9900
|
aaronmk
|
# mnemonic: 4 looks like A for Alternate
|
673 |
9651
|
aaronmk
|
# do NOT use 1x, which are used by eval (which is used by set_fds())
|
674 |
|
|
# do NOT use 2x, which are used as global stdin/stdout/stderr
|
675 |
|
|
# do NOT use 3x, which are used for logging
|
676 |
9279
|
aaronmk
|
|
677 |
9282
|
aaronmk
|
setup_log_fd() # view logging output at verbosity >= 5
|
678 |
|
|
{
|
679 |
9319
|
aaronmk
|
log+ 4; log-- echo_func
|
680 |
9282
|
aaronmk
|
fd_set_default '30>&2' || true # stdlog
|
681 |
|
|
log_fd=30 # stdlog
|
682 |
|
|
}
|
683 |
|
|
setup_log_fd
|
684 |
|
|
|
685 |
9279
|
aaronmk
|
set_global_fds()
|
686 |
|
|
# allows commands to access global stdin/stdout/stderr using fd 20/21/22
|
687 |
|
|
# this works even when /dev/tty isn't available
|
688 |
9283
|
aaronmk
|
# view logging output at verbosity >= 3
|
689 |
9279
|
aaronmk
|
{
|
690 |
9319
|
aaronmk
|
log+ 2; log-- echo_func
|
691 |
9279
|
aaronmk
|
# ignore errors if a source fd isn't open
|
692 |
|
|
fd_set_default '20<&0' || true
|
693 |
|
|
fd_set_default '21>&1' || true
|
694 |
|
|
fd_set_default '22>&2' || true
|
695 |
|
|
}
|
696 |
|
|
set_global_fds
|
697 |
|
|
|
698 |
|
|
# usage: explicit_errors_only=1 script...
|
699 |
|
|
# show only explicitly-displayed errors (which have been redirected to fd 22)
|
700 |
|
|
# most of the time this has the same effect as `verbosity=0 script...`,
|
701 |
|
|
# which displays everything that isn't explicitly hidden
|
702 |
|
|
# this option should only be used for testing the explicit error displaying
|
703 |
|
|
if test "$explicit_errors_only"; then disable_logging; fi
|
704 |
|
|
|
705 |
|
|
|
706 |
9731
|
aaronmk
|
echo_vars is_outermost
|
707 |
|
|
|
708 |
|
|
|
709 |
9264
|
aaronmk
|
#### paths
|
710 |
|
|
|
711 |
9735
|
aaronmk
|
top_symlink_dir="$(dirname "$0")"; echo_vars top_symlink_dir
|
712 |
9736
|
aaronmk
|
top_symlink_dir_abs="$(realpath "$top_symlink_dir")"
|
713 |
|
|
echo_vars top_symlink_dir_abs
|
714 |
9724
|
aaronmk
|
|
715 |
9269
|
aaronmk
|
top_script_abs="$(realpath "$0")"; echo_vars top_script_abs # outermost script
|
716 |
|
|
# realpath this before doing any cd so this points to the right place
|
717 |
9724
|
aaronmk
|
top_dir_abs="$(dirname "$top_script_abs")"; echo_vars top_dir_abs
|
718 |
9269
|
aaronmk
|
|
719 |
9265
|
aaronmk
|
set_paths()
|
720 |
|
|
{
|
721 |
9788
|
aaronmk
|
top_script="$(clog++ canon_rel_path "$top_script_abs")" || return
|
722 |
9331
|
aaronmk
|
echo_vars top_script
|
723 |
|
|
top_dir="$(dirname "$top_script")" || return; echo_vars top_dir
|
724 |
9265
|
aaronmk
|
}
|
725 |
|
|
set_paths
|
726 |
9264
|
aaronmk
|
|
727 |
9945
|
aaronmk
|
# usage: in_top_dir cmd...
|
728 |
|
|
function in_top_dir() { echo_func; (cd "$top_dir"; "$@"); }
|
729 |
|
|
alias in_top_dir='"in_top_dir" ' # last space alias-expands next word
|
730 |
|
|
|
731 |
9725
|
aaronmk
|
PATH_rm() # usage: PATH_rm path... # removes components from the PATH
|
732 |
|
|
{
|
733 |
|
|
echo_func; echo_vars PATH; : "${PATH?}"
|
734 |
10020
|
aaronmk
|
log+ 2
|
735 |
|
|
split : "$PATH"
|
736 |
|
|
local new_paths=()
|
737 |
|
|
for path in "${parts[@]}"; do
|
738 |
|
|
if ! contains "$path" "$@"; then new_paths+=("$path"); fi
|
739 |
|
|
done
|
740 |
|
|
PATH="$(delim=: join "${new_paths[@]}")" || return
|
741 |
10154
|
aaronmk
|
log- 2
|
742 |
9725
|
aaronmk
|
echo_vars PATH
|
743 |
|
|
}
|
744 |
9264
|
aaronmk
|
|
745 |
9726
|
aaronmk
|
no_PATH_recursion() # usage: (no_PATH_recursion; cmd...)
|
746 |
|
|
# allows running a system command of the same name as the script
|
747 |
9737
|
aaronmk
|
{
|
748 |
|
|
echo_func
|
749 |
|
|
PATH_rm "$top_dir_abs" "$top_symlink_dir" "$top_symlink_dir_abs" "$top_dir"
|
750 |
|
|
}
|
751 |
9725
|
aaronmk
|
|
752 |
10021
|
aaronmk
|
# makes command in $1 nonrecursive
|
753 |
|
|
# allows running a system command of the same name as the script
|
754 |
|
|
alias cmd2abs_path="$(cat <<'EOF'
|
755 |
|
|
declare _1="$1"; shift
|
756 |
|
|
_1="$(indent; no_PATH_recursion; log++; which "$_1"|echo_stdout)" || return
|
757 |
|
|
set -- "$_1" "$@"
|
758 |
|
|
EOF
|
759 |
|
|
)"
|
760 |
9726
|
aaronmk
|
|
761 |
10021
|
aaronmk
|
|
762 |
9264
|
aaronmk
|
#### verbose output
|
763 |
|
|
|
764 |
|
|
|
765 |
9123
|
aaronmk
|
## internal commands
|
766 |
|
|
|
767 |
9166
|
aaronmk
|
.()
|
768 |
|
|
{
|
769 |
9850
|
aaronmk
|
clog++ clog++ echo_func
|
770 |
|
|
cmd2rel_path; set -- "$FUNCNAME" "$@"
|
771 |
9435
|
aaronmk
|
if (log++; echo_params; can_log); then indent; fi
|
772 |
9166
|
aaronmk
|
builtin "$@"
|
773 |
|
|
}
|
774 |
9158
|
aaronmk
|
|
775 |
9853
|
aaronmk
|
.rel() # usage: .rel file [args...] # file relative to ${BASH_SOURCE[0]} dir
|
776 |
|
|
{
|
777 |
|
|
clog++ clog++ echo_func; local file="$1"; shift
|
778 |
10059
|
aaronmk
|
. "$(canon_rel_path "$(dirname "$(realpath "${BASH_SOURCE[1]}")")/$file")" \
|
779 |
|
|
"$@"
|
780 |
9853
|
aaronmk
|
}
|
781 |
|
|
|
782 |
9253
|
aaronmk
|
cd() # indent is permanent within subshell cd was used in
|
783 |
|
|
{
|
784 |
9393
|
aaronmk
|
log++ echo_func
|
785 |
9306
|
aaronmk
|
cmd2rel_path; echo_cmd "$FUNCNAME" "$@"
|
786 |
9435
|
aaronmk
|
if can_log; then caller_indent; fi
|
787 |
9307
|
aaronmk
|
# -P: expand symlinks so $PWD matches the output of realpath
|
788 |
9306
|
aaronmk
|
builtin "$FUNCNAME" -P "$@"
|
789 |
9313
|
aaronmk
|
|
790 |
|
|
func=realpath clear_cache
|
791 |
9266
|
aaronmk
|
set_paths
|
792 |
9253
|
aaronmk
|
}
|
793 |
|
|
|
794 |
9110
|
aaronmk
|
## external commands
|
795 |
|
|
|
796 |
9262
|
aaronmk
|
disable_logging() { set_fds "$log_fd>/dev/null"; }
|
797 |
9224
|
aaronmk
|
|
798 |
9685
|
aaronmk
|
function redir() # usage: local redirs=(#<>...); redir cmd...; unset redirs
|
799 |
9138
|
aaronmk
|
# to view only explicitly-displayed errors: explicit_errors_only=1 script...
|
800 |
9134
|
aaronmk
|
{
|
801 |
9686
|
aaronmk
|
echo_func; kw_params redirs
|
802 |
9687
|
aaronmk
|
|
803 |
|
|
case "$1" in redir|command) "$@"; return;; esac # redir will be run later
|
804 |
9685
|
aaronmk
|
(
|
805 |
|
|
log++ set_fds "${redirs[@]}"
|
806 |
10769
|
aaronmk
|
unset redirs # don't redirect again in invoked command
|
807 |
9685
|
aaronmk
|
(case "$1" in command__exec) shift;; esac; echo_redirs_cmd)
|
808 |
|
|
"$@"
|
809 |
|
|
) || return
|
810 |
|
|
}
|
811 |
|
|
alias redir='"redir" ' # last space alias-expands next word
|
812 |
|
|
|
813 |
9689
|
aaronmk
|
alias_append save_e '; unset redirs' # don't redirect error handlers
|
814 |
|
|
|
815 |
10022
|
aaronmk
|
fi # load new aliases
|
816 |
|
|
if self_being_included; then
|
817 |
|
|
|
818 |
|
|
command() # usage: [cmd_log_fd=|1|2|#] [verbosity_min=] [nonrecursive=1] \
|
819 |
|
|
# command extern_cmd...
|
820 |
9685
|
aaronmk
|
{
|
821 |
9740
|
aaronmk
|
echo_func; kw_params log_fd cmd_log_fd redirs verbosity_min
|
822 |
9291
|
aaronmk
|
# if no cmd_log_fd, limit log_fd in case command uses util.sh
|
823 |
|
|
local cmd_log_fd="${cmd_log_fd-$log_fd}"
|
824 |
9473
|
aaronmk
|
local redirs=("${redirs[@]}")
|
825 |
9231
|
aaronmk
|
|
826 |
9685
|
aaronmk
|
# determine redirections
|
827 |
9436
|
aaronmk
|
if test "$cmd_log_fd"; then
|
828 |
|
|
if can_log; then
|
829 |
|
|
if test "$cmd_log_fd" != "$log_fd"; then
|
830 |
9473
|
aaronmk
|
redirs+=("$cmd_log_fd>&$log_fd")
|
831 |
9436
|
aaronmk
|
fi # else no redir needed
|
832 |
9473
|
aaronmk
|
else redirs+=("$cmd_log_fd>/dev/null");
|
833 |
9436
|
aaronmk
|
fi
|
834 |
|
|
fi
|
835 |
9444
|
aaronmk
|
|
836 |
10022
|
aaronmk
|
if test "$nonrecursive"; then cmd2abs_path; else cmd2rel_path; fi
|
837 |
9685
|
aaronmk
|
redir command__exec "$@" || die_e
|
838 |
9134
|
aaronmk
|
}
|
839 |
9685
|
aaronmk
|
command__exec()
|
840 |
|
|
{
|
841 |
|
|
ensure_nested_func
|
842 |
|
|
if can_log; then indent; fi
|
843 |
|
|
if test "$verbosity_min"; then verbosity_min "$verbosity_min"; fi
|
844 |
9868
|
aaronmk
|
verbosity_compat
|
845 |
9723
|
aaronmk
|
builtin command "$@"
|
846 |
9685
|
aaronmk
|
}
|
847 |
9133
|
aaronmk
|
|
848 |
9110
|
aaronmk
|
|
849 |
|
|
### external command input/output
|
850 |
8907
|
aaronmk
|
|
851 |
9074
|
aaronmk
|
echo_stdin() # usage: input|echo_stdin|cmd
|
852 |
8702
|
aaronmk
|
{
|
853 |
8897
|
aaronmk
|
if can_log; then
|
854 |
8998
|
aaronmk
|
pipe_delay
|
855 |
9212
|
aaronmk
|
echo ----- >&"$log_fd"
|
856 |
|
|
tee -a /dev/fd/"$log_fd";
|
857 |
|
|
echo ----- >&"$log_fd"
|
858 |
8897
|
aaronmk
|
else cat
|
859 |
|
|
fi
|
860 |
8702
|
aaronmk
|
}
|
861 |
8275
|
aaronmk
|
|
862 |
9318
|
aaronmk
|
echo_stdout() { echo_stdin; } # usage: cmd|echo_stdout
|
863 |
9044
|
aaronmk
|
|
864 |
8873
|
aaronmk
|
|
865 |
8854
|
aaronmk
|
#### commands
|
866 |
|
|
|
867 |
9622
|
aaronmk
|
already_exists_msg() # usage: cond || what=... already_exists_msg || return 0
|
868 |
|
|
{ type=info die "$what already exists, skipping"; }
|
869 |
9620
|
aaronmk
|
|
870 |
9122
|
aaronmk
|
require_not_exists() # usage: require_not_exists file || return 0
|
871 |
9622
|
aaronmk
|
{ test ! -e "$1" || what="file \"$1\"" already_exists_msg; }
|
872 |
9062
|
aaronmk
|
|
873 |
9680
|
aaronmk
|
function to_file() # usage: stdout=... [if_not_exists=1] [del=] to_file cmd...
|
874 |
8986
|
aaronmk
|
# auto-removes a command's output file on error (like make's .DELETE_ON_ERROR)
|
875 |
9048
|
aaronmk
|
{
|
876 |
9695
|
aaronmk
|
echo_func; kw_params stdout if_not_exists del
|
877 |
9680
|
aaronmk
|
: "${stdout?}"; local del="${del-1}"
|
878 |
9475
|
aaronmk
|
if test "$if_not_exists"; then require_not_exists "$stdout" || return 0; fi
|
879 |
9481
|
aaronmk
|
|
880 |
9652
|
aaronmk
|
local redirs=("${redirs[@]}" ">$stdout")
|
881 |
9690
|
aaronmk
|
redir "$@" || { save_e; test ! "$del" || rm "$stdout"; rethrow; }
|
882 |
9048
|
aaronmk
|
}
|
883 |
9177
|
aaronmk
|
alias to_file='"to_file" ' # last space alias-expands next word
|
884 |
8986
|
aaronmk
|
|
885 |
9747
|
aaronmk
|
log_bg() { symbol='&' log_custom "$@"; }
|
886 |
|
|
|
887 |
|
|
log_last_bg() { log_bg '$!='"$!"; }
|
888 |
|
|
|
889 |
|
|
function bg_cmd() { echo_func; "$@" & log_last_bg; } # usage: bg_cmd cmd...
|
890 |
|
|
alias bg_cmd='"bg_cmd" ' # last space alias-expands next word
|
891 |
|
|
|
892 |
8272
|
aaronmk
|
|
893 |
9552
|
aaronmk
|
#### filesystem
|
894 |
|
|
|
895 |
9830
|
aaronmk
|
alias mkdir='mkdir -p'
|
896 |
|
|
|
897 |
9556
|
aaronmk
|
alias file_size=\
|
898 |
9558
|
aaronmk
|
"stat `case "$(uname)" in Darwin) echo -f %z;; *) echo --format=%s;; esac`"
|
899 |
9552
|
aaronmk
|
|
900 |
9829
|
aaronmk
|
alias wildcard='shopt -s nullglob; echo' # usage: "$(wildcard glob...)"
|
901 |
9939
|
aaronmk
|
alias wildcard1='shopt -s nullglob; echo1' # usage: "$(wildcard1 glob...)"
|
902 |
9552
|
aaronmk
|
|
903 |
9831
|
aaronmk
|
fi # load new aliases
|
904 |
|
|
if self_being_included; then
|
905 |
9829
|
aaronmk
|
|
906 |
9831
|
aaronmk
|
mv2dir() { echo_func; mkdir "${!#}"; mv "$@"; } # usage: mv2dir ... dir
|
907 |
|
|
|
908 |
|
|
# usage: (mv_glob ... dir)
|
909 |
|
|
function mv_glob() { echo_func; if (($# > 1)); then mv2dir "$@"; fi; }
|
910 |
|
|
alias mv_glob='shopt -s nullglob; "mv_glob"'
|
911 |
|
|
|
912 |
|
|
|
913 |
8966
|
aaronmk
|
#### URLs
|
914 |
|
|
|
915 |
9074
|
aaronmk
|
localize_url() { test _"$1" = _"$(hostname -f)" || echo "$1"; }
|
916 |
8966
|
aaronmk
|
|
917 |
8704
|
aaronmk
|
fi
|