Skip to content

Commit a108818

Browse files
authored
Merge pull request hestiacp#4251 from jmclaren7/installer-prompts-y-n
Use standard y/N format in installer to indicate default
2 parents 9f00490 + 925d7e5 commit a108818

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

install/hst-install-debian.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ if [ -n "$conflicts" ] && [ -z "$force" ]; then
482482
echo
483483
echo '!!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!'
484484
echo
485-
read -p 'Would you like to remove the conflicting packages? [y/n] ' answer
485+
read -p 'Would you like to remove the conflicting packages? [y/N] ' answer
486486
if [ "$answer" = 'y' ] || [ "$answer" = 'Y' ]; then
487487
apt-get -qq purge $conflicts -y
488488
check_result $? 'apt-get remove failed'
@@ -679,7 +679,7 @@ echo -e "\n"
679679

680680
# Asking for confirmation to proceed
681681
if [ "$interactive" = 'yes' ]; then
682-
read -p 'Would you like to continue with the installation? [Y/N]: ' answer
682+
read -p 'Would you like to continue with the installation? [y/N]: ' answer
683683
if [ "$answer" != 'y' ] && [ "$answer" != 'Y' ]; then
684684
echo 'Goodbye'
685685
exit 1

install/hst-install-ubuntu.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ if [ -n "$conflicts" ] && [ -z "$force" ]; then
471471
echo
472472
echo '!!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!'
473473
echo
474-
read -p 'Would you like to remove the conflicting packages? [y/n] ' answer
474+
read -p 'Would you like to remove the conflicting packages? [y/N] ' answer
475475
if [ "$answer" = 'y' ] || [ "$answer" = 'Y' ]; then
476476
apt-get -qq purge $conflicts -y
477477
check_result $? 'apt-get remove failed'
@@ -668,7 +668,7 @@ echo -e "\n"
668668

669669
# Asking for confirmation to proceed
670670
if [ "$interactive" = 'yes' ]; then
671-
read -p 'Would you like to continue with the installation? [Y/N]: ' answer
671+
read -p 'Would you like to continue with the installation? [y/N]: ' answer
672672
if [ "$answer" != 'y' ] && [ "$answer" != 'Y' ]; then
673673
echo 'Goodbye'
674674
exit 1

0 commit comments

Comments
 (0)