Deleted Added
full compact
any.subr (250535) any.subr (251190)
1if [ ! "$_MEDIA_ANY_SUBR" ]; then _MEDIA_ANY_SUBR=1
2#
3# Copyright (c) 2012-2013 Devin Teske
4# All Rights Reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

--- 10 unchanged lines hidden (view full) ---

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
1if [ ! "$_MEDIA_ANY_SUBR" ]; then _MEDIA_ANY_SUBR=1
2#
3# Copyright (c) 2012-2013 Devin Teske
4# All Rights Reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

--- 10 unchanged lines hidden (view full) ---

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
27# $FreeBSD: head/usr.sbin/bsdconfig/share/media/any.subr 250535 2013-05-12 00:39:25Z dteske $
27# $FreeBSD: head/usr.sbin/bsdconfig/share/media/any.subr 251190 2013-05-31 19:07:17Z dteske $
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." media/any.subr
34f_include $BSDCFG_SHARE/dialog.subr
35f_include $BSDCFG_SHARE/struct.subr

--- 28 unchanged lines hidden (view full) ---

64#
65f_media_get_type()
66{
67 f_dialog_title "$msg_choose_installation_media"
68 local title="$DIALOG_TITLE" btitle="$DIALOG_BACKTITLE"
69 f_dialog_title_restore
70 local prompt="$msg_choose_installation_media_description"
71 local hline="$hline_choose_help_for_more_information_on_media_types"
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." media/any.subr
34f_include $BSDCFG_SHARE/dialog.subr
35f_include $BSDCFG_SHARE/struct.subr

--- 28 unchanged lines hidden (view full) ---

64#
65f_media_get_type()
66{
67 f_dialog_title "$msg_choose_installation_media"
68 local title="$DIALOG_TITLE" btitle="$DIALOG_BACKTITLE"
69 f_dialog_title_restore
70 local prompt="$msg_choose_installation_media_description"
71 local hline="$hline_choose_help_for_more_information_on_media_types"
72 local menu_list size
72 local menu_list
73
74 menu_list="
75 '1 $msg_cd_dvd' '$msg_install_from_a_freebsd_cd_dvd'
76 '2 $msg_ftp' '$msg_install_from_an_ftp_server'
77 '3 $msg_ftp_passive'
78 '$msg_install_from_an_ftp_server_thru_firewall'
79 '4 $msg_http' '$msg_install_from_an_ftp_server_thru_proxy'
80 '5 $msg_directory' '$msg_install_from_the_existing_filesystem'
81 '6 $msg_nfs' '$msg_install_over_nfs'
82 '7 $msg_dos' '$msg_install_from_a_dos_partition'
83 '8 $msg_ufs' '$msg_install_from_a_ufs_partition'
84 '9 $msg_floppy' '$msg_install_from_a_floppy_disk_set'
85 'A $msg_usb' '$msg_install_from_a_usb_drive'
86 'X $msg_options' '$msg_view_set_various_media_options'
87 " # END-QUOTE
88
73
74 menu_list="
75 '1 $msg_cd_dvd' '$msg_install_from_a_freebsd_cd_dvd'
76 '2 $msg_ftp' '$msg_install_from_an_ftp_server'
77 '3 $msg_ftp_passive'
78 '$msg_install_from_an_ftp_server_thru_firewall'
79 '4 $msg_http' '$msg_install_from_an_ftp_server_thru_proxy'
80 '5 $msg_directory' '$msg_install_from_the_existing_filesystem'
81 '6 $msg_nfs' '$msg_install_over_nfs'
82 '7 $msg_dos' '$msg_install_from_a_dos_partition'
83 '8 $msg_ufs' '$msg_install_from_a_ufs_partition'
84 '9 $msg_floppy' '$msg_install_from_a_floppy_disk_set'
85 'A $msg_usb' '$msg_install_from_a_usb_drive'
86 'X $msg_options' '$msg_view_set_various_media_options'
87 " # END-QUOTE
88
89 size=$( eval f_dialog_menu_size \
90 \"\$title\" \
91 \"\$btitle\" \
92 \"\$prompt\" \
93 \"\$hline\" \
94 $menu_list )
89 local height width rows
90 eval f_dialog_menu_size height width rows \
91 \"\$title\" \
92 \"\$btitle\" \
93 \"\$prompt\" \
94 \"\$hline\" \
95 $menu_list
95
96 local dialog_menu
97
98 while :; do
99 dialog_menu=$( eval $DIALOG \
96
97 local dialog_menu
98
99 while :; do
100 dialog_menu=$( eval $DIALOG \
100 --title \"\$title\" \
101 --backtitle \"\$btitle\" \
102 --hline \"\$hline\" \
103 --ok-label \"\$msg_ok\" \
104 --cancel-label \"\$msg_cancel\" \
105 --help-button \
106 --help-label \"\$msg_help\" \
107 ${USE_XDIALOG:+--help \"\"} \
108 --menu \"\$prompt\" $size $menu_list \
101 --title \"\$title\" \
102 --backtitle \"\$btitle\" \
103 --hline \"\$hline\" \
104 --ok-label \"\$msg_ok\" \
105 --cancel-label \"\$msg_cancel\" \
106 --help-button \
107 --help-label \"\$msg_help\" \
108 ${USE_XDIALOG:+--help \"\"} \
109 --menu \"\$prompt\" \
110 $height $width $rows \
111 $menu_list \
109 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
110 )
111 local retval=$?
112 setvar DIALOG_MENU_$$ "$dialog_menu"
113
114 local mtag
115 mtag=$( f_dialog_menutag )
116 f_dprintf "retval=%s mtag=[%s]" $retval "$mtag"

--- 36 unchanged lines hidden ---
112 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
113 )
114 local retval=$?
115 setvar DIALOG_MENU_$$ "$dialog_menu"
116
117 local mtag
118 mtag=$( f_dialog_menutag )
119 f_dprintf "retval=%s mtag=[%s]" $retval "$mtag"

--- 36 unchanged lines hidden ---