Prechádzať zdrojové kódy

Merge pull request #4251 from jmclaren7/installer-prompts-y-n

Use standard y/N format in installer to indicate default
Jaap Marcus 2 rokov pred
rodič
commit
a108818151

+ 2 - 2
install/hst-install-debian.sh

@@ -482,7 +482,7 @@ if [ -n "$conflicts" ] && [ -z "$force" ]; then
 	echo
 	echo
 	echo '!!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!'
 	echo '!!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!'
 	echo
 	echo
-	read -p 'Would you like to remove the conflicting packages? [y/n] ' answer
+	read -p 'Would you like to remove the conflicting packages? [y/N] ' answer
 	if [ "$answer" = 'y' ] || [ "$answer" = 'Y' ]; then
 	if [ "$answer" = 'y' ] || [ "$answer" = 'Y' ]; then
 		apt-get -qq purge $conflicts -y
 		apt-get -qq purge $conflicts -y
 		check_result $? 'apt-get remove failed'
 		check_result $? 'apt-get remove failed'
@@ -679,7 +679,7 @@ echo -e "\n"
 
 
 # Asking for confirmation to proceed
 # Asking for confirmation to proceed
 if [ "$interactive" = 'yes' ]; then
 if [ "$interactive" = 'yes' ]; then
-	read -p 'Would you like to continue with the installation? [Y/N]: ' answer
+	read -p 'Would you like to continue with the installation? [y/N]: ' answer
 	if [ "$answer" != 'y' ] && [ "$answer" != 'Y' ]; then
 	if [ "$answer" != 'y' ] && [ "$answer" != 'Y' ]; then
 		echo 'Goodbye'
 		echo 'Goodbye'
 		exit 1
 		exit 1

+ 2 - 2
install/hst-install-ubuntu.sh

@@ -471,7 +471,7 @@ if [ -n "$conflicts" ] && [ -z "$force" ]; then
 	echo
 	echo
 	echo '!!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!'
 	echo '!!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!'
 	echo
 	echo
-	read -p 'Would you like to remove the conflicting packages? [y/n] ' answer
+	read -p 'Would you like to remove the conflicting packages? [y/N] ' answer
 	if [ "$answer" = 'y' ] || [ "$answer" = 'Y' ]; then
 	if [ "$answer" = 'y' ] || [ "$answer" = 'Y' ]; then
 		apt-get -qq purge $conflicts -y
 		apt-get -qq purge $conflicts -y
 		check_result $? 'apt-get remove failed'
 		check_result $? 'apt-get remove failed'
@@ -668,7 +668,7 @@ echo -e "\n"
 
 
 # Asking for confirmation to proceed
 # Asking for confirmation to proceed
 if [ "$interactive" = 'yes' ]; then
 if [ "$interactive" = 'yes' ]; then
-	read -p 'Would you like to continue with the installation? [Y/N]: ' answer
+	read -p 'Would you like to continue with the installation? [y/N]: ' answer
 	if [ "$answer" != 'y' ] && [ "$answer" != 'Y' ]; then
 	if [ "$answer" != 'y' ] && [ "$answer" != 'Y' ]; then
 		echo 'Goodbye'
 		echo 'Goodbye'
 		exit 1
 		exit 1