Skip to content

Commit 5db4977

Browse files
committed
build
1 parent d39af96 commit 5db4977

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

usr/share/usability-misc/dist-installer-cli-standalone

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4120,14 +4120,8 @@ main() {
41204120
###############
41214121
## BEGIN PRE ##
41224122
###############
4123-
log notice "Saving user log to: '${log_file_user}'"
4124-
if test_file -f "${log_file_debug}"; then
4125-
log notice "Saving debug log to: '${log_file_debug}'"
4126-
fi
41274123
log info "Starting main function."
41284124

4129-
guest_pretty="$(capitalize_first_char "${guest}")"
4130-
41314125
case "${guest}" in
41324126
whonix)
41334127
guest_full_vm_name_gateway="${guest_pretty}-Gateway-${interface_name}"
@@ -4143,11 +4137,6 @@ main() {
41434137
log info " ${item}"
41444138
done
41454139

4146-
if [ "${virtualbox_only}" = "1" ]; then
4147-
log notice "${underline}Installer:${nounderline} ${bold}'VirtualBox Installer'${nobold}"
4148-
else
4149-
log notice "${underline}Installer:${nounderline} ${bold}'${guest_pretty} ${interface_name} for ${hypervisor_pretty} Installer'${nobold}"
4150-
fi
41514140
if [ "${non_interactive}" != "1" ]; then
41524141
log notice "If you wish to cancel installation, press Ctrl+C."
41534142
fi
@@ -4597,6 +4586,7 @@ parse_opt() {
45974586
set -o xtrace
45984587
fi
45994588
range_arg guest "${guest}" none whonix kicksecure
4589+
guest_pretty="$(capitalize_first_char "${guest}")"
46004590
range_arg interface "${interface}" cli xfce
46014591
range_arg hypervisor "${hypervisor}" kvm virtualbox
46024592
range_arg import_only "${import_only}" workstation gateway both
@@ -4752,6 +4742,19 @@ log_term_and_file() {
47524742
xtrace=1
47534743
}
47544744

4745+
welcome() {
4746+
if [ "${virtualbox_only}" = "1" ]; then
4747+
log notice "${underline}Installer:${nounderline} ${bold}'VirtualBox Installer'${nobold}"
4748+
else
4749+
log notice "${underline}Installer:${nounderline} ${bold}'${guest_pretty} ${interface_name} for ${hypervisor_pretty} Installer'${nobold}"
4750+
fi
4751+
4752+
log notice "Saving user log to: '${log_file_user}'"
4753+
4754+
if test_file -f "${log_file_debug}"; then
4755+
log notice "Saving debug log to: '${log_file_debug}'"
4756+
fi
4757+
}
47554758

47564759
end_installer() {
47574760
log notice "Installer Result: ${green}${bold}'SUCCESS'${nobold}${nocolor}"
@@ -4777,6 +4780,7 @@ run_installer() {
47774780
parse_opt "${@}"
47784781
## Logging mechanism.
47794782
log_term_and_file
4783+
welcome
47804784

47814785
get_os
47824786
get_distro

0 commit comments

Comments
 (0)