Skip to content

Commit 2545805

Browse files
committed
Replaced "chat" and "chatf" with "vtalk" and "vtalkf".
1 parent de7aeee commit 2545805

8 files changed

+76
-29
lines changed

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -208,16 +208,16 @@ handy functions for writing bash-based scripts
208208

209209
Copyright 2006-2013 Alan K. Stebbens <[email protected]>
210210

211-
chat MSG ..
212-
chatf FMT ARGS ..
213-
214-
If `$norun` or `$verbose` is set, print (or printf) all args on `STDERR`.
215-
216211
talk MSG ..
217212
talkf FMT ARGS ..
218213

219214
Print (or printf) all arguments on `STDERR`.
220215

216+
vtalk MSG ..
217+
vtalkf FMT ARGS ..
218+
219+
If `$norun` or `$verbose` is set, print (or printf) all args on `STDERR`.
220+
221221
nvtalk MSG
222222
nvtalkf FMT ARGS ..
223223

date-utils.sh

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
# bash
2-
# date-utils.sh
2+
# date-utils.sh -- date management utility for bash
3+
#
34
# Copyright 2009-2013 Alan K. Stebbens <[email protected]>
4-
#
5+
6+
[[ -z "$DATE_UTILS_SH" ]] || return
7+
8+
DATE_UTILS_SH="${BASH_SOURCE[0]}"
9+
510
# functions for date management
611
#
712
# date_arg YYYY-MM-DD
@@ -250,3 +255,5 @@ get_date_last_quarter_end() {
250255
print_date $year $month 1
251256
}
252257

258+
# end of date-utils.sh
259+
# vim: set ai sw=2

sh-utils.sh

+12-13
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ sh_utils_help() {
1414
cat 1>&2 <<EOF
1515
Shell utility functions:
1616
17-
talk MSG .. Print all arguments on STDERR.
18-
chat MSG .. If $norun or $verbose is set, print all args on STDERR.
17+
talk MSG .. Print all arguments on STDERR.
18+
vtalk MSG .. If $norun or $verbose is set, print all args on STDERR.
1919
nvtalk MSG Print all arguments on STDERR only if $verbose is not set.
2020
error [CODE] "MSG" Print MSG on STDERR, then exit with code CODE (or 2)
2121
22-
talkf FMT ARGS .. printf FMT ARGS on STDERR
23-
chatf FMT ARGS .. printf FMT ARGS on STDERR if $norun or $verbose set
22+
talkf FMT ARGS .. printf FMT ARGS on STDERR
23+
vtalkf FMT ARGS .. printf FMT ARGS on STDERR if $norun or $verbose set
2424
nvtalkf FMT ARGS .. printf FMT ARGS on STDERR unless $verbose set
2525
errorf [CODE] FMT ARGS .. printf FMT ARGS on STDERR, then exit $CODE [2]
2626
@@ -36,14 +36,13 @@ EOF
3636
}
3737
help_sh_utils() { sh_utils_help ; }
3838

39-
# chat MSG - show MSG on STDERR if $norun or $verbose
40-
# talk MSG - show MSG on STDERR
41-
# warn MSG - show MSG on STDERR
39+
# talk MSG - show MSG on STDERR
40+
# vtalk MSG - show MSG on STDERR if $norun or $verbose
4241
# nvtalk MSG - show MSG on STDERR unless $verbose is set
4342

4443
talk() { echo 1>&2 "$@" ; }
4544
warn() { talk "$@" ; }
46-
chat() { [[ -n "$norun$verbose" ]] && talk "$@" ; }
45+
vtalk() { [[ -n "$norun$verbose" ]] && talk "$@" ; }
4746
nvtalk() { [[ -z "$verbose" ]] && talk "$@" ; }
4847

4948
# error [CODE] MSG - show MSG on STDERR then exit with error CODE [default 2]
@@ -55,14 +54,14 @@ error() {
5554
exit $code
5655
}
5756

58-
# chatf FMT ARGS.. printf FMT ARGS on STDERR if $norun or $verbose are set
59-
# talkf FMT ARGS... printf FMT ARGS on STDERR
60-
# warnf FMT ARGS... alias for talkf
61-
# nvtalkf FMT ARGS.. printf FMT ARGS on STDERR unless $verbose set
57+
# talkf FMT ARGS... printf FMT ARGS on STDERR
58+
# warnf FMT ARGS... alias for talkf
59+
# vtalkf FMT ARGS.. printf FMT ARGS on STDERR if $norun or $verbose are set
60+
# nvtalkf FMT ARGS.. printf FMT ARGS on STDERR unless $verbose set
6261

6362
talkf() { printf 1>&2 "$@" ; }
6463
warnf() { talkf "$@" ; }
65-
chatf() { [[ -n "$norun$verbose" ]] && talkf "$@" ; }
64+
vtalkf() { [[ -n "$norun$verbose" ]] && talkf "$@" ; }
6665
nvtalkf() { [[ -z "$verbose" ]] && talkf "$@" ; }
6766

6867
# errorf [CODE] FMT ARGS .. print FMT ARGS on STDERR, then exit with CODE[2]

sync-files.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ build_files() {
103103
file="$( eval echo \"${FILENAME_BUILDER:?'FILENAME_BUILDER not defined!'}\" )"
104104
if [[ -e "$file" ]]; then # already exists?
105105
if [[ -z "$force" ]]; then # force build it?
106-
chat "Not building $file; already exists."
106+
vtalk "Not building $file; already exists."
107107
continue # no, skip it
108108
else
109-
chat "Rebuilding $file.."
109+
vtalk "Rebuilding $file.."
110110
fi
111111
fi
112112
run "$( eval echo \"$FILE_GENERATOR\" )"

t1.sh

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#/bin/sh
2+
# Copyright 2006-2013, Alan K. Stebbens <[email protected]>
3+
#
4+
# Test module for list-utils.sh
5+
#
6+
7+
export PATH=.:$HOME/lib:$PATH
8+
9+
source list-utils.sh
10+
source test-utils.sh
11+
12+
tlist1=( now is the time for all good men to come to the aid of their country )
13+
14+
items=( `grep_list tlist1 the` )
15+
16+
echo "$?"
17+
echo `join_list items`
18+
exit

t2.sh

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#/bin/sh
2+
echo "\
3+
s/ /%20/g ; s/\\\$/%24/g ; s/\>/%3E/g ;
4+
s/#/%23/g ; s/\%/%25/g ; s/\[/%5B/g ;
5+
s/'/%27/g ; s/\&/%26/g ; s/\]/%5D/g ;
6+
s/,/%2C/g ; s/\(/%28/g ; s/\^/%5E/g ;
7+
s/-/%2D/g ; s/\)/%29/g ; s/\`/%60/g ;
8+
s/=/%3D/g ; s/\*/%2A/g ; s/\{/%7B/g ;
9+
s/[\]/%5C/g ; s/\+/%2B/g ; s/\|/%7C/g ;
10+
s/\!/%21/g ; s/\//%2F/g ; s/\}/%7D/g ;
11+
s/\"/%22/g ; s/\</%3C/g ; s/\~/%7E/g"
12+
13+
echo ''
14+
15+
echo "\
16+
s/\%20/ /g ; s/\%29/)/g ; s/\%5B/[/g ;
17+
s/\%21/\!/g ; s/\%2A/*/g ; s/\%5C/\\\\/g ;
18+
s/\%22/\"/g ; s/\%2B/+/g ; s/\%5D/]/g ;
19+
s/\%23/\#/g ; s/\%2C/,/g ; s/\%5E/^/g ;
20+
s/\%24/\$/g ; s/\%2D/-/g ; s/\%60/\`/g ;
21+
s/\%25/\%/g ; s/\%2F/\//g ; s/\%7B/{/g ;
22+
s/\%26/\&/g ; s/\%3C/</g ; s/\%7C/|/g ;
23+
s/\%27/'/g ; s/\%3D/=/g ; s/\%7D/}/g ;
24+
s/\%28/(/g ; s/\%3E/>/g ; s/\%7E/~/g"

test-sh-utils.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ talk "one two three"
2020

2121
for norun in '' 1 ; do
2222
for verbose in '' 1 ; do
23-
echo -n 1>&2 "norun=$norun verbose=$verbose : chat says: "
24-
chat "this is a test"
23+
echo -n 1>&2 "norun=$norun verbose=$verbose : vtalk says: "
24+
vtalk "this is a test"
2525
echo 1>&2
2626
done
2727
done
@@ -37,9 +37,9 @@ while [[ $x -lt ${#wordlist[*]} ]]; do
3737
x=$((x + 1))
3838
done
3939

40-
echo $'\nTesting chatf ..'
40+
echo $'\nTesting vtalkf ..'
4141

4242
verobse= norun=
4343
for verbose in '' 1 ; do
44-
chatf "Verbose = %s\n" $verbose
44+
vtalkf "Verbose = %s\n" $verbose
4545
done

text-utils.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
[[ -z "$TEXT_UTILS_SH" ]] || return
77

8+
export TEXT_UTILS_SH="${BASH_SOURCE[0]}"
9+
810
help_test_utils() {
911
cat 1>&2 <<EOF
1012
lowercase STRING # return the lowercase string
@@ -106,8 +108,5 @@ html_decode() {
106108
}
107109

108110

109-
# define TEXT_UTILS_SH as the source file that brought us in
110-
export TEXT_UTILS_SH="${BASH_SOURCE[0]}"
111-
112111
# end text-utils.sh
113112
# vim: set sw=2 ai

0 commit comments

Comments
 (0)