Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix yes no parsing #664

Merged
merged 10 commits into from
May 12, 2023
Merged

Fix yes no parsing #664

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1903b4c
Make yes/no parsing case insensitive
marcoesters Apr 19, 2023
0643709
Accept default value for license agreement
marcoesters Apr 19, 2023
1c4e15e
Fix typo
marcoesters Apr 19, 2023
1dee78f
Merge branch 'main' into fix-yes-no-parsing
marcoesters Apr 26, 2023
eb4c5b2
Add news file
marcoesters Apr 26, 2023
f317d06
Merge branch 'fix-yes-no-parsing' of github.com:conda/constructor int…
marcoesters Apr 26, 2023
766282e
Remove brackets from tr command
marcoesters Apr 26, 2023
c1cecfe
Fix pre-commit errors
marcoesters Apr 26, 2023
13b77e6
Fix typo
marcoesters Apr 26, 2023
497474e
Update news/664-fix-yes-no-parsing
jaimergp May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions constructor/header.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ then
printf " Are sure you want to continue the installation? [yes|no]\\n"
printf "[no] >>> "
read -r ans
if [ "$ans" != "yes" ] && [ "$ans" != "Yes" ] && [ "$ans" != "YES" ] && \
[ "$ans" != "y" ] && [ "$ans" != "Y" ]
ans=$(echo "${ans}" | tr '[:lower:]' '[:upper:]')
if [ "$ans" != "YES" ] && [ "$ans" != "Y" ]
then
printf "Aborting installation\\n"
exit 2
Expand All @@ -154,8 +154,8 @@ then
printf " Are sure you want to continue the installation? [yes|no]\\n"
printf "[no] >>> "
read -r ans
if [ "$ans" != "yes" ] && [ "$ans" != "Yes" ] && [ "$ans" != "YES" ] && \
[ "$ans" != "y" ] && [ "$ans" != "Y" ]
ans=$(echo "${ans}" | tr '[:lower:]' '[:upper:]')
if [ "$ans" != "YES" ] && [ "$ans" != "Y" ]
then
printf "Aborting installation\\n"
exit 2
Expand All @@ -171,8 +171,8 @@ then
printf " Are sure you want to continue the installation? [yes|no]\\n"
printf "[no] >>> "
read -r ans
if [ "$ans" != "yes" ] && [ "$ans" != "Yes" ] && [ "$ans" != "YES" ] && \
[ "$ans" != "y" ] && [ "$ans" != "Y" ]
ans=$(echo "${ans}" | tr '[:lower:]' '[:upper:]')
if [ "$ans" != "YES" ] && [ "$ans" != "Y" ]
then
printf "Aborting installation\\n"
exit 2
Expand All @@ -188,8 +188,8 @@ then
printf " Are sure you want to continue the installation? [yes|no]\\n"
printf "[no] >>> "
read -r ans
if [ "$ans" != "yes" ] && [ "$ans" != "Yes" ] && [ "$ans" != "YES" ] && \
[ "$ans" != "y" ] && [ "$ans" != "Y" ]
ans=$(echo "${ans}" | tr '[:lower:]' '[:upper:]')
if [ "$ans" != "YES" ] && [ "$ans" != "Y" ]
then
printf "Aborting installation\\n"
exit 2
Expand All @@ -205,8 +205,8 @@ then
printf " Are sure you want to continue the installation? [yes|no]\\n"
printf "[no] >>> "
read -r ans
if [ "$ans" != "yes" ] && [ "$ans" != "Yes" ] && [ "$ans" != "YES" ] && \
[ "$ans" != "y" ] && [ "$ans" != "Y" ]
ans=$(echo "${ans}" | tr '[:lower:]' '[:upper:]')
if [ "$ans" != "YES" ] && [ "$ans" != "Y" ]
then
printf "Aborting installation\\n"
exit 2
Expand All @@ -222,8 +222,8 @@ then
printf " Are sure you want to continue the installation? [yes|no]\\n"
printf "[no] >>> "
read -r ans
if [ "$ans" != "yes" ] && [ "$ans" != "Yes" ] && [ "$ans" != "YES" ] && \
[ "$ans" != "y" ] && [ "$ans" != "Y" ]
ans=$(echo "${ans}" | tr '[:lower:]' '[:upper:]')
if [ "$ans" != "YES" ] && [ "$ans" != "Y" ]
then
printf "Aborting installation\\n"
exit 2
Expand All @@ -239,8 +239,8 @@ then
printf " Are sure you want to continue the installation? [yes|no]\\n"
printf "[no] >>> "
read -r ans
if [ "$ans" != "yes" ] && [ "$ans" != "Yes" ] && [ "$ans" != "YES" ] && \
[ "$ans" != "y" ] && [ "$ans" != "Y" ]
ans=$(echo "${ans}" | tr '[:lower:]' '[:upper:]')
if [ "$ans" != "YES" ] && [ "$ans" != "Y" ]
then
printf "Aborting installation\\n"
exit 2
Expand Down Expand Up @@ -268,14 +268,15 @@ EOF
printf "Do you accept the license terms? [yes|no]\\n"
printf "[no] >>> "
read -r ans
while [ "$ans" != "yes" ] && [ "$ans" != "Yes" ] && [ "$ans" != "YES" ] && \
[ "$ans" != "no" ] && [ "$ans" != "No" ] && [ "$ans" != "NO" ]
ans=$(echo "${ans}" | tr '[:lower:]' '[:upper:]')
while [ "$ans" != "YES" ] && [ "$ans" != "NO" ] && [ "$ans" != "" ]
do
printf "Please answer 'yes' or 'no':'\\n"
printf ">>> "
read -r ans
ans=$(echo "${ans}" | tr '[:lower:]' '[:upper:]')
done
if [ "$ans" != "yes" ] && [ "$ans" != "Yes" ] && [ "$ans" != "YES" ]
if [ "$ans" != "YES" ]
then
printf "The license agreement wasn't approved, aborting installation.\\n"
exit 2
Expand Down Expand Up @@ -548,8 +549,8 @@ if [ "$BATCH" = "0" ]; then
if [ "$ans" = "" ]; then
ans=$DEFAULT
fi
if [ "$ans" != "yes" ] && [ "$ans" != "Yes" ] && [ "$ans" != "YES" ] && \
[ "$ans" != "y" ] && [ "$ans" != "Y" ]
ans=$(echo "${ans}" | tr '[:lower:]' '[:upper:]')
if [ "$ans" != "YES" ] && [ "$ans" != "Y" ]
then
printf "\\n"
printf "You have chosen to not have conda modify your shell scripts at all.\\n"
Expand Down
19 changes: 19 additions & 0 deletions news/664-fix-yes-no-parsing
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
### Enhancements

* <news item>

### Bug fixes

* Improve parsing of yes/no prompts
jaimergp marked this conversation as resolved.
Show resolved Hide resolved

### Deprecations

* <news item>

### Docs

* <news item>

### Other

* <news item>