summaryrefslogtreecommitdiffstats
path: root/usr.sbin/bsdconfig/share
diff options
context:
space:
mode:
authordteske <dteske@FreeBSD.org>2013-06-02 22:34:40 +0000
committerdteske <dteske@FreeBSD.org>2013-06-02 22:34:40 +0000
commit6ffb8bc7f6d4d5ba800c2d70733d9a242419bbdd (patch)
tree3eb19e76eb6d2cf52ec6aac7f416ee00680315c6 /usr.sbin/bsdconfig/share
parent9d0ce6189690b6d7b4012fe28c3ebb3617861595 (diff)
downloadFreeBSD-src-6ffb8bc7f6d4d5ba800c2d70733d9a242419bbdd.zip
FreeBSD-src-6ffb8bc7f6d4d5ba800c2d70733d9a242419bbdd.tar.gz
Improvements to whitespace and comments.
Diffstat (limited to 'usr.sbin/bsdconfig/share')
-rw-r--r--usr.sbin/bsdconfig/share/dialog.subr2
-rw-r--r--usr.sbin/bsdconfig/share/mustberoot.subr3
-rwxr-xr-xusr.sbin/bsdconfig/share/packages/packages.subr26
3 files changed, 16 insertions, 15 deletions
diff --git a/usr.sbin/bsdconfig/share/dialog.subr b/usr.sbin/bsdconfig/share/dialog.subr
index 5fe309f..1da5320 100644
--- a/usr.sbin/bsdconfig/share/dialog.subr
+++ b/usr.sbin/bsdconfig/share/dialog.subr
@@ -1672,7 +1672,7 @@ f_dialog_inputstr_fetch()
#
# Prompt the user with a dialog(1) inputbox to enter some value. The inputbox
# remains until the the user presses ENTER or ESC, or otherwise ends the
-# editing session, by selecting `Cancel' for example.
+# editing session (by selecting `Cancel' for example).
#
# If the user presses ENTER, the exit status is zero (success), otherwise if
# the user presses ESC the exit status is 255, or if the user chose Cancel, the
diff --git a/usr.sbin/bsdconfig/share/mustberoot.subr b/usr.sbin/bsdconfig/share/mustberoot.subr
index 0b134f8..a05ddc7 100644
--- a/usr.sbin/bsdconfig/share/mustberoot.subr
+++ b/usr.sbin/bsdconfig/share/mustberoot.subr
@@ -171,7 +171,8 @@ f_become_root_via_sudo()
--cancel-label "$msg_cancel" \
--password --inputbox "$prompt" \
$height $width \
- 2>&1 > /dev/null )
+ 2>&1 > /dev/null
+ )
retval=$?
# Catch X11-related errors
diff --git a/usr.sbin/bsdconfig/share/packages/packages.subr b/usr.sbin/bsdconfig/share/packages/packages.subr
index dae80a1..d3c9f80 100755
--- a/usr.sbin/bsdconfig/share/packages/packages.subr
+++ b/usr.sbin/bsdconfig/share/packages/packages.subr
@@ -307,18 +307,18 @@ f_package_menu_categories()
$menu_list
local menu_choice
menu_choice=$( eval $DIALOG \
- --title \"\$DIALOG_TITLE\" \
- --backtitle \"\$DIALOG_BACKTITLE\" \
- --hline \"\$hline\" \
- --item-help \
- --default-item \"\$defaultitem\" \
- --ok-label \"$msg_select\" \
- --cancel-label \"$msg_cancel\" \
- --menu \"\$prompt\" \
- $height $width $rows \
- $menu_list \
- 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
- )
+ --title \"\$DIALOG_TITLE\" \
+ --backtitle \"\$DIALOG_BACKTITLE\" \
+ --hline \"\$hline\" \
+ --item-help \
+ --default-item \"\$defaultitem\" \
+ --ok-label \"$msg_select\" \
+ --cancel-label \"$msg_cancel\" \
+ --menu \"\$prompt\" \
+ $height $width $rows \
+ $menu_list \
+ 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
+ )
local retval=$?
f_dialog_menutag_store -s "$menu_choice"
return $retval
@@ -353,7 +353,7 @@ f_package_index_get_page()
fi
}
-# f_package_menu_select $category [ $page [ $defaultitem ] ]
+# f_package_menu_select $category [$page [$defaultitem]]
#
# Display list of packages for $category, optionally $page N and with a default
# item selected. If $page is omitted, the first page is displayed (but this
OpenPOWER on IntegriCloud