From 9f82df651a2dd1ff495850d78e054344f58b263e Mon Sep 17 00:00:00 2001 From: dteske Date: Tue, 18 Jun 2013 07:33:45 +0000 Subject: Whitespace improvements. --- usr.sbin/bsdconfig/console/console | 1 - usr.sbin/bsdconfig/console/font | 29 ++++----- usr.sbin/bsdconfig/console/keymap | 120 +++++++++++++++++------------------ usr.sbin/bsdconfig/console/repeat | 9 ++- usr.sbin/bsdconfig/console/saver | 26 ++++---- usr.sbin/bsdconfig/console/screenmap | 1 - 6 files changed, 91 insertions(+), 95 deletions(-) diff --git a/usr.sbin/bsdconfig/console/console b/usr.sbin/bsdconfig/console/console index 5a05080..7be4ff5 100755 --- a/usr.sbin/bsdconfig/console/console +++ b/usr.sbin/bsdconfig/console/console @@ -136,7 +136,6 @@ while :; do "7 $msg_ttys") # Choose console terminal type $BSDCFG_LIBE/$APP_DIR/ttys ${USE_XDIALOG:+-X} ;; esac - done exit $SUCCESS diff --git a/usr.sbin/bsdconfig/console/font b/usr.sbin/bsdconfig/console/font index abe82ed..44e51a2 100755 --- a/usr.sbin/bsdconfig/console/font +++ b/usr.sbin/bsdconfig/console/font @@ -78,20 +78,20 @@ dialog_menu_main() $menu_list case "$( f_sysrc_get font8x8 )" in - [Nn][Oo]|'') defaultitem="1 $msg_none";; - cp437-8x8) defaultitem="2 $msg_ibm_437";; - cp850-8x8) defaultitem="3 $msg_ibm_850";; - cp865-8x8) defaultitem="4 $msg_ibm_865";; - cp866-8x8) defaultitem="5 $msg_ibm_866";; - cp866u-8x8) defaultitem="6 $msg_ibm_866u";; - cp1251-8x8) defaultitem="7 $msg_ibm_1251";; - iso-8x8) defaultitem="8 $msg_iso_8859_1";; - iso02-8x8) defaultitem="9 $msg_iso_8859_2";; - iso04-8x8) defaultitem="a $msg_iso_8859_4";; - iso07-8x8) defaultitem="b $msg_iso_8859_7";; - iso08-8x8) defaultitem="c $msg_iso_8859_8";; - iso15-8x8) defaultitem="d $msg_iso_8859_15";; - swiss-8x8) defaultitem="e $msg_swiss";; + [Nn][Oo]|'') defaultitem="1 $msg_none" ;; + cp437-8x8) defaultitem="2 $msg_ibm_437" ;; + cp850-8x8) defaultitem="3 $msg_ibm_850" ;; + cp865-8x8) defaultitem="4 $msg_ibm_865" ;; + cp866-8x8) defaultitem="5 $msg_ibm_866" ;; + cp866u-8x8) defaultitem="6 $msg_ibm_866u" ;; + cp1251-8x8) defaultitem="7 $msg_ibm_1251" ;; + iso-8x8) defaultitem="8 $msg_iso_8859_1" ;; + iso02-8x8) defaultitem="9 $msg_iso_8859_2" ;; + iso04-8x8) defaultitem="a $msg_iso_8859_4" ;; + iso07-8x8) defaultitem="b $msg_iso_8859_7" ;; + iso08-8x8) defaultitem="c $msg_iso_8859_8" ;; + iso15-8x8) defaultitem="d $msg_iso_8859_15" ;; + swiss-8x8) defaultitem="e $msg_swiss" ;; esac local menu_choice @@ -216,7 +216,6 @@ while :; do f_sysrc_set font8x16 "swiss-8x16" || f_die break ;; esac - done exit $SUCCESS diff --git a/usr.sbin/bsdconfig/console/keymap b/usr.sbin/bsdconfig/console/keymap index 66c1203..8c94d75 100755 --- a/usr.sbin/bsdconfig/console/keymap +++ b/usr.sbin/bsdconfig/console/keymap @@ -119,66 +119,66 @@ dialog_menu_main() $menu_list case "$( f_sysrc_get keymap )" in - be.iso) defaultitem="$msg_belgian";; - br275.cp850) defaultitem="$msg_brazil_cp850";; - br275.iso) defaultitem="$msg_brazil_iso";; - br275.iso.acc) defaultitem="$msg_brazil_iso_accent";; - bg.bds.ctrlcaps) defaultitem="$msg_bulgarian_bds";; - bg.phonetic.ctrlcaps) defaultitem="$msg_bulgarian_phonetic";; - ce.iso2) defaultitem="$msg_central_european_iso";; - hr.iso) defaultitem="$msg_croatian_iso";; - cs.latin2.qwertz) defaultitem="$msg_czech_iso_accent";; - danish.cp865) defaultitem="$msg_danish_cp865";; - danish.iso) defaultitem="$msg_danish_iso";; - estonian.cp850) defaultitem="$msg_estonian_cp850";; - estonian.iso) defaultitem="$msg_estonian_iso";; - estonian.iso15) defaultitem="$msg_estonian_iso_15";; - finnish.cp850) defaultitem="$msg_finnish_cp850";; - finnish.iso) defaultitem="$msg_finnish_iso";; - fr.iso) defaultitem="$msg_french_iso";; - fr.iso.acc) defaultitem="$msg_french_iso_accent";; - fr.macbook.acc) defaultitem="$msg_french_iso_macbook";; - german.cp850) defaultitem="$msg_german_cp850";; - german.iso) defaultitem="$msg_german_iso";; - gr.us101.acc) defaultitem="$msg_greek_101";; - el.iso07) defaultitem="$msg_greek_104";; - gr.elot.acc) defaultitem="$msg_greek_elot";; - hu.iso2.101keys) defaultitem="$msg_hungarian_101";; - hu.iso2.102keys) defaultitem="$msg_hungarian_102";; - icelandic.iso) defaultitem="$msg_icelandic";; - icelandic.iso.acc) defaultitem="$msg_icelandic_accent";; - it.iso) defaultitem="$msg_italian";; - jp.106) defaultitem="$msg_japanese_106";; - latinamerican) defaultitem="$msg_latin_american";; - latinamerican.iso.acc) defaultitem="$msg_latin_american_accent";; - norwegian.iso) defaultitem="$msg_norway_iso";; - pl_PL.ISO8859-2) defaultitem="$msg_polish_iso";; - pt.iso) defaultitem="$msg_portuguese";; - pt.iso.acc) defaultitem="$msg_portuguese_accent";; - ru.koi8-r) defaultitem="$msg_russia_koi8_r";; - sk.iso2) defaultitem="$msg_slovak";; - si.iso) defaultitem="$msg_slovenian";; - spanish.iso) defaultitem="$msg_spanish";; - spanish.iso.acc) defaultitem="$msg_spanish_accent";; - swedish.cp850) defaultitem="$msg_swedish_cp850";; - swedish.iso) defaultitem="$msg_swedish_iso";; - swissfrench.cp850) defaultitem="$msg_swiss_french_cp850";; - swissfrench.iso) defaultitem="$msg_swiss_french_iso";; - swissfrench.iso.acc) defaultitem="$msg_swiss_french_iso_accent";; - swissgerman.cp850) defaultitem="$msg_swiss_german_cp850";; - swissgerman.iso) defaultitem="$msg_swiss_german_iso";; - swissgerman.iso.acc) defaultitem="$msg_swiss_german_iso_accent";; - uk.cp850) defaultitem="$msg_uk_cp850";; - uk.iso) defaultitem="$msg_uk_iso";; - ua.koi8-u) defaultitem="$msg_ukrainian_koi8_u";; - ua.koi8-u.shift.alt) defaultitem="$msg_ukrainian_koi8_u_koi8_r";; - us.pc-ctrl) defaultitem="$msg_usa_capslock_ctrl";; - us.dvorak) defaultitem="$msg_usa_dvorak";; - us.dvorakl) defaultitem="$msg_usa_dvorak_left";; - us.dvorakr) defaultitem="$msg_usa_dvorak_right";; - us.emacs) defaultitem="$msg_usa_emacs";; - us.iso) defaultitem="$msg_usa_iso";; - us.unix) defaultitem="$msg_usa_unix";; + be.iso) defaultitem="$msg_belgian" ;; + br275.cp850) defaultitem="$msg_brazil_cp850" ;; + br275.iso) defaultitem="$msg_brazil_iso" ;; + br275.iso.acc) defaultitem="$msg_brazil_iso_accent" ;; + bg.bds.ctrlcaps) defaultitem="$msg_bulgarian_bds" ;; + bg.phonetic.ctrlcaps) defaultitem="$msg_bulgarian_phonetic" ;; + ce.iso2) defaultitem="$msg_central_european_iso" ;; + hr.iso) defaultitem="$msg_croatian_iso" ;; + cs.latin2.qwertz) defaultitem="$msg_czech_iso_accent" ;; + danish.cp865) defaultitem="$msg_danish_cp865" ;; + danish.iso) defaultitem="$msg_danish_iso" ;; + estonian.cp850) defaultitem="$msg_estonian_cp850" ;; + estonian.iso) defaultitem="$msg_estonian_iso" ;; + estonian.iso15) defaultitem="$msg_estonian_iso_15" ;; + finnish.cp850) defaultitem="$msg_finnish_cp850" ;; + finnish.iso) defaultitem="$msg_finnish_iso" ;; + fr.iso) defaultitem="$msg_french_iso" ;; + fr.iso.acc) defaultitem="$msg_french_iso_accent" ;; + fr.macbook.acc) defaultitem="$msg_french_iso_macbook" ;; + german.cp850) defaultitem="$msg_german_cp850" ;; + german.iso) defaultitem="$msg_german_iso" ;; + gr.us101.acc) defaultitem="$msg_greek_101" ;; + el.iso07) defaultitem="$msg_greek_104" ;; + gr.elot.acc) defaultitem="$msg_greek_elot" ;; + hu.iso2.101keys) defaultitem="$msg_hungarian_101" ;; + hu.iso2.102keys) defaultitem="$msg_hungarian_102" ;; + icelandic.iso) defaultitem="$msg_icelandic" ;; + icelandic.iso.acc) defaultitem="$msg_icelandic_accent" ;; + it.iso) defaultitem="$msg_italian" ;; + jp.106) defaultitem="$msg_japanese_106" ;; + latinamerican) defaultitem="$msg_latin_american" ;; + latinamerican.iso.acc) defaultitem="$msg_latin_american_accent" ;; + norwegian.iso) defaultitem="$msg_norway_iso" ;; + pl_PL.ISO8859-2) defaultitem="$msg_polish_iso" ;; + pt.iso) defaultitem="$msg_portuguese" ;; + pt.iso.acc) defaultitem="$msg_portuguese_accent" ;; + ru.koi8-r) defaultitem="$msg_russia_koi8_r" ;; + sk.iso2) defaultitem="$msg_slovak" ;; + si.iso) defaultitem="$msg_slovenian" ;; + spanish.iso) defaultitem="$msg_spanish" ;; + spanish.iso.acc) defaultitem="$msg_spanish_accent" ;; + swedish.cp850) defaultitem="$msg_swedish_cp850" ;; + swedish.iso) defaultitem="$msg_swedish_iso" ;; + swissfrench.cp850) defaultitem="$msg_swiss_french_cp850" ;; + swissfrench.iso) defaultitem="$msg_swiss_french_iso" ;; + swissfrench.iso.acc) defaultitem="$msg_swiss_french_iso_accent" ;; + swissgerman.cp850) defaultitem="$msg_swiss_german_cp850" ;; + swissgerman.iso) defaultitem="$msg_swiss_german_iso" ;; + swissgerman.iso.acc) defaultitem="$msg_swiss_german_iso_accent" ;; + uk.cp850) defaultitem="$msg_uk_cp850" ;; + uk.iso) defaultitem="$msg_uk_iso" ;; + ua.koi8-u) defaultitem="$msg_ukrainian_koi8_u" ;; + ua.koi8-u.shift.alt) defaultitem="$msg_ukrainian_koi8_u_koi8_r" ;; + us.pc-ctrl) defaultitem="$msg_usa_capslock_ctrl" ;; + us.dvorak) defaultitem="$msg_usa_dvorak" ;; + us.dvorakl) defaultitem="$msg_usa_dvorak_left" ;; + us.dvorakr) defaultitem="$msg_usa_dvorak_right" ;; + us.emacs) defaultitem="$msg_usa_emacs" ;; + us.iso) defaultitem="$msg_usa_iso" ;; + us.unix) defaultitem="$msg_usa_unix" ;; esac # The defaultitem may have to be indented to match the menu_list diff --git a/usr.sbin/bsdconfig/console/repeat b/usr.sbin/bsdconfig/console/repeat index ab4ba78..deabb60 100755 --- a/usr.sbin/bsdconfig/console/repeat +++ b/usr.sbin/bsdconfig/console/repeat @@ -68,10 +68,10 @@ dialog_menu_main() $menu_list case "$( f_sysrc_get keyrate )" in - slow) defaultitem="$msg_slow";; - normal) defaultitem="$msg_normal";; - fast) defaultitem="$msg_fast";; - [Nn][Oo]|'') defaultitem="$msg_default";; + [Nn][Oo]|'') defaultitem="$msg_default" ;; + slow) defaultitem="$msg_slow" ;; + normal) defaultitem="$msg_normal" ;; + fast) defaultitem="$msg_fast" ;; esac local menu_choice @@ -135,7 +135,6 @@ while :; do f_sysrc_set keyrate "NO" || f_die break ;; esac - done exit $SUCCESS diff --git a/usr.sbin/bsdconfig/console/saver b/usr.sbin/bsdconfig/console/saver index 94128f3..2345078 100755 --- a/usr.sbin/bsdconfig/console/saver +++ b/usr.sbin/bsdconfig/console/saver @@ -78,19 +78,19 @@ dialog_menu_main() $menu_list case "$( f_sysrc_get saver )" in - [Nn][Oo]|'') defaultitem="1 $msg_none" ;; - blank) defaultitem="2 $msg_blank" ;; - beastie) defaultitem="3 $msg_beastie";; - daemon) defaultitem="4 $msg_daemon" ;; - dragon) defaultitem="5 $msg_dragon" ;; - fade) defaultitem="6 $msg_fade" ;; - fire) defaultitem="7 $msg_fire" ;; - green) defaultitem="8 $msg_green" ;; - logo) defaultitem="9 $msg_logo" ;; - rain) defaultitem="a $msg_rain" ;; - snake) defaultitem="b $msg_snake" ;; - star) defaultitem="c $msg_star" ;; - warp) defaultitem="d $msg_warp" ;; + [Nn][Oo]|'') defaultitem="1 $msg_none" ;; + blank) defaultitem="2 $msg_blank" ;; + beastie) defaultitem="3 $msg_beastie" ;; + daemon) defaultitem="4 $msg_daemon" ;; + dragon) defaultitem="5 $msg_dragon" ;; + fade) defaultitem="6 $msg_fade" ;; + fire) defaultitem="7 $msg_fire" ;; + green) defaultitem="8 $msg_green" ;; + logo) defaultitem="9 $msg_logo" ;; + rain) defaultitem="a $msg_rain" ;; + snake) defaultitem="b $msg_snake" ;; + star) defaultitem="c $msg_star" ;; + warp) defaultitem="d $msg_warp" ;; esac local menu_choice diff --git a/usr.sbin/bsdconfig/console/screenmap b/usr.sbin/bsdconfig/console/screenmap index 27f4cb9..5b5c19d 100755 --- a/usr.sbin/bsdconfig/console/screenmap +++ b/usr.sbin/bsdconfig/console/screenmap @@ -145,7 +145,6 @@ while :; do f_sysrc_set scrnmap "koi8-u2cp866u" || f_die break ;; esac - done exit $SUCCESS -- cgit v1.1