Easy start script: remember DE choice
This commit is contained in:
@@ -6,6 +6,7 @@ display=:10
|
|||||||
interface=0.0.0.0
|
interface=0.0.0.0
|
||||||
cert_group=ssl-cert
|
cert_group=ssl-cert
|
||||||
xstartup_script=~/.vnc/xstartup
|
xstartup_script=~/.vnc/xstartup
|
||||||
|
de_was_selected_file="$HOME/.vnc/.kasmvncserver-easy-start-de-was-selected"
|
||||||
|
|
||||||
manual_xstartup_choice="Manually edit xstartup"
|
manual_xstartup_choice="Manually edit xstartup"
|
||||||
declare -A all_desktop_environments=(
|
declare -A all_desktop_environments=(
|
||||||
@@ -67,6 +68,14 @@ ask_user_to_choose_de() {
|
|||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
remember_de_choice() {
|
||||||
|
touch "$de_was_selected_file"
|
||||||
|
}
|
||||||
|
|
||||||
|
de_was_selected() {
|
||||||
|
[[ -f "$de_was_selected_file" ]]
|
||||||
|
}
|
||||||
|
|
||||||
detect_desktop_environment() {
|
detect_desktop_environment() {
|
||||||
local de_name="$1"
|
local de_name="$1"
|
||||||
local executable="$2"
|
local executable="$2"
|
||||||
@@ -141,10 +150,15 @@ if [[ "$action" = "kill" ]]; then
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
detect_desktop_environments
|
if ! de_was_selected; then
|
||||||
ask_user_to_choose_de
|
detect_desktop_environments
|
||||||
debug "You selected $de_name desktop environment"
|
ask_user_to_choose_de
|
||||||
setup_de_to_run_via_xstartup
|
debug "You selected $de_name desktop environment"
|
||||||
|
if [[ "$de_name" != "$manual_xstartup_choice" ]]; then
|
||||||
|
setup_de_to_run_via_xstartup
|
||||||
|
fi
|
||||||
|
remember_de_choice
|
||||||
|
fi
|
||||||
|
|
||||||
vncserver $display -interface $interface
|
vncserver $display -interface $interface
|
||||||
vncserver -kill $display
|
vncserver -kill $display
|
||||||
|
|||||||
Reference in New Issue
Block a user