vncserver: no xstartup overwrite confirmation if it doesn't exist

This commit is contained in:
Dmitry Maksyoma 2021-09-15 18:01:47 +12:00
parent ec948ab20f
commit 9faf87389f
2 changed files with 5 additions and 1 deletions

View File

@ -169,6 +169,10 @@ warn_xstartup_will_be_overwriten() {
return 0
fi
if [ ! -f "$xstartup_script" ]; then
return 0
fi
echo -n "WARNING: $xstartup_script will be overwritten y/N?"
read -r do_overwrite_xstartup
if [[ "$do_overwrite_xstartup" = "y" || "$do_overwrite_xstartup" = "Y" ]]; then

View File

@ -51,7 +51,7 @@ with description('vncserver') as self:
with it('asks user to select a DE on the first run'):
add_kasmvnc_user_docker()
completed_process = run_cmd(vncserver_cmd, input="1\ny\n")
completed_process = run_cmd(vncserver_cmd, input="1\n")
expect(completed_process.returncode).to(equal(0))
check_de_was_setup_to_run('cinnamon')