Devin Teske
19cae84e23
Remove completely unnecesary parentheses
2016-12-13 01:52:10 +00:00
Devin Teske
751993945a
Why repeat yourself when you can send stderr to the same place as stdout?
2016-12-13 01:50:22 +00:00
Devin Teske
66ef7d9455
Properly quote variable
2016-12-13 01:44:18 +00:00
Devin Teske
a51195769a
Use more generic f_yesno() from provided API
2016-12-13 01:42:13 +00:00
Devin Teske
f52733d46e
The output of dialog needs to be sanitized
...
for portability/compatibility requirements
2016-12-13 01:41:06 +00:00
Devin Teske
f20b7768fc
Whitespace alignment
2016-12-13 01:39:09 +00:00
Devin Teske
d401d36c04
Sort the domains
2016-12-13 01:36:46 +00:00
Devin Teske
95ee591e83
The --no-items and --stdout options are non-standard and should be avoided
...
From the dialog(1) manual:
using [--stdout] in portable scripts is not recommended
2016-12-13 01:35:26 +00:00
Devin Teske
6e038cc2eb
More efficiently make use of the exit status
2016-12-13 00:27:56 +00:00
Devin Teske
1c61211223
Stop repeating strings (centralize prompt string)
...
NB: Changes to strings now only affect a single line
2016-12-13 00:22:01 +00:00
Devin Teske
e2577019ed
Add missing backslash (no real effect; it's pedantic and correct for
...
the interpolation level)
2016-12-13 00:18:51 +00:00
Devin Teske
e7f2eb12c2
Use the oft-neglected awk syntax "startcondition, stopcondition { ... }" to
...
process the range of country labels which appear as columnar list from the
"ifconfig DEV list countries" command. Not only improving maintainability,
but also properly encapsulating arguments in single-quotes instead of
trying to escape whitespace. It is also completely unnecessary to collapse
newlines into whitespace (shell will do this for you automatically upon
expansion of the contents where necessary).
NB: This also changes the sorting algorithm to sort on the country code,
not the country name. The type-ahead feature of dialog is destroyed if the
tags are not sorted properly.
2016-12-13 00:02:59 +00:00
Devin Teske
49748e0a6d
Quote WLAN_IFACE (pedantic)
2016-12-12 22:57:07 +00:00
Devin Teske
6c26775c2f
In awk, casting a variable as a boolean condition is the same as testing if
...
the length of the variable contents is greater than zero
This allows us to also move the secondary condition into the action clause
2016-12-12 21:29:48 +00:00
Devin Teske
275c0c0741
Remove an unnecessary call to f_dialog_title_restore()
2016-12-12 21:27:29 +00:00
Devin Teske
1045858386
Whitespace
2016-12-12 21:26:36 +00:00
Devin Teske
d124dfc410
Utilize provided i18n strings
2016-12-12 21:23:47 +00:00
Devin Teske
877ea04721
Remove incomplete and unnecessary creation of fd3
...
The provided API already provides a passthru descriptor and even
gives you a varaible for referring to it.
2016-12-12 21:20:56 +00:00
Devin Teske
8bcf564644
Remove unnecessary semi-colons
2016-12-12 21:18:24 +00:00
Devin Teske
0b8f01fe99
Use awk the following (more succinct) awk syntax:
...
condition1 { action1 }
condition2 { action2 }
instead of the following syntax:
{
if (condition1) { action1 }
else if (condition2) { action2 }
}
2016-12-12 21:16:37 +00:00
Devin Teske
d9f83eb9f4
1 is the default descriptor for redirects without an fd prefix
2016-12-12 21:11:55 +00:00
Devin Teske
bef42d18c5
Fix invalid parameter expansion (change $@ to "$@")
...
Without quotes, $@ loses its special meanining (see below)
% sh -c 'echo $@' /bin/sh " 1 " " 2 "
1 2
% sh -c 'echo "$@"' /bin/sh " 1 " " 2 "
1 2
The quotes are required to get ARGV to be unperterped
2016-12-12 21:04:11 +00:00
Devin Teske
35c8d5eb1b
Allow the script path to contain whitespace and special characters
2016-12-12 21:01:20 +00:00
Devin Teske
58ce2edc98
Use provided API to centralize dialog title strings
2016-12-12 21:00:09 +00:00
Devin Teske
7797a5973f
Reorder dialog parameters based on commonality for readability
2016-12-12 20:54:20 +00:00
Devin Teske
6ea6e3fa7d
Fix incorrect use of provided API
...
The result of which was incorrectly sized menu dialogs
2016-12-12 20:49:49 +00:00
Devin Teske
ea2e60b01c
Use provided API (change "dialog" to "$DIALOG")
2016-12-12 20:43:09 +00:00
Devin Teske
2abc4c242e
Whitespace (dialog options separated to minimize diffs)
2016-12-12 20:41:27 +00:00
Devin Teske
b5938e7da3
Consolidate redirects into here documents, with proper code indentation
2016-12-12 19:46:49 +00:00
Hiroki Sato
dc96a41b44
- Refactor listening socket list. All of the listening sockets are
...
now maintained in a single linked-list in a transport-independent manner.
- Use queue.h for linked-list structure.
- Use linked-list for AllowedPeers.
- Use getaddrinfo(8) even for Unix Domain sockets.
- Use macros to type-casting from/to struct sockaddr{,_in,_in6}.
- Define fu_* macro for union f_un to shorten the member names.
- Remove an extra #include <sys/type.h>.
- Add "static" to non-exported symbols.
- !INET support is still incomplete but will be fixed later.
There is no functional change except for some minor debug messages.
2016-12-12 19:33:40 +00:00
Devin Teske
15fadc4858
Remove an unnecessary "return $?" at end of function
2016-12-12 19:26:55 +00:00
Hiroki Sato
8555a6e0a4
Temporarily backout the previous commit because it was totally broken due to
...
unresolved merge conflicts.
Pointy hat to: hrs
2016-12-12 19:24:52 +00:00
Devin Teske
7bcf4508be
Use ternary operator
2016-12-12 19:24:32 +00:00
Devin Teske
0e638f57e6
If you're not going to make use of the products of a match() in awk
...
(e.g., RSTART and RLENGTH variables) then use ~ instead of match()
2016-12-12 19:12:31 +00:00
Devin Teske
71ef4d586a
Now that these variables do not contain the --default-item flag itself,
...
change the name of the variable from $def_item_... to $default_...
2016-12-12 19:10:39 +00:00
Hiroki Sato
783e461c73
- Refactor listening socket list. All of the listening sockets are
...
now maintained in a single linked-list in a transport-independent manner.
- Use queue.h for linked-list structure.
- Use linked-list for AllowedPeers.
- Use getaddrinfo(8) even for Unix Domain sockets.
- Use macros to type-casting from/to struct sockaddr{,_in,_in6}.
- Define fu_* macro for union f_un to shorten the member names.
- Remove an extra #include <sys/type.h>.
- Add "static" to non-exported symbols.
- !INET support is still incomplete but will be fixed later.
There is no functional change except for some minor debug messages.
2016-12-12 19:10:14 +00:00
Devin Teske
86e1d2977f
Always pass --default-item parameter to dialog
2016-12-12 19:09:17 +00:00
Devin Teske
48e9fce2f5
There is zero harm in always passing --default-item to dialog
2016-12-12 19:07:42 +00:00
Devin Teske
58dc38bd1c
Centralize backtitle string
2016-12-12 19:01:04 +00:00
Devin Teske
5357f8f7c8
Use provided API instead of hard-coded status integers
2016-12-12 18:55:41 +00:00
Devin Teske
76b07bd950
Whitespace
2016-12-12 18:52:22 +00:00
Devin Teske
9ca8b7be34
Remove unnecessary `-n' parameter to head/tail
2016-12-12 18:48:00 +00:00
Devin Teske
3204364296
awk(1) match() takes a regex, use /.../ to remind ourselves of this
...
NB: The difference between "..." and /.../ for a regex in awk is that
quoted strings go through escape expansion first (e.g., \\ becomes \)
2016-12-12 18:45:52 +00:00
Devin Teske
4fa8c81cc3
Be internally consistent (": > ..." is used elsewhere in this file)
2016-12-12 18:43:42 +00:00
Devin Teske
edcf330372
"echo | sed | sed | awk" is silly (changed to "echo | awk")
2016-12-12 18:42:55 +00:00
Devin Teske
1cac9fc2a3
Add missing `-e' parameter to sed invocations
2016-12-12 18:39:26 +00:00
Devin Teske
8d5182d698
Allow $BSDINSTALL_TMPETC to contain whitespace or special chars
2016-12-12 18:38:18 +00:00
Devin Teske
c62801e26d
Group fallbacks together
2016-12-12 18:34:21 +00:00
Devin Teske
0b04945dc0
Remove unnecessary quotes around number in test
2016-12-12 18:33:40 +00:00
Devin Teske
e9c843adc7
Change "[ ! ... ] && ..." to "[ ... ] || ..."
2016-12-12 18:29:24 +00:00