Selaa lähdekoodia

Case insensitive User Input (#1475)

* Always lower User input
5olu7ion 2 vuotta sitten
vanhempi
commit
34674317b3
2 muutettua tiedostoa jossa 3 lisäystä ja 3 poistoa
  1. 2 2
      install/alpine-docker-install.sh
  2. 1 1
      misc/alpine-install.func

+ 2 - 2
install/alpine-docker-install.sh

@@ -34,7 +34,7 @@ PORTAINER_LATEST_VERSION=$(get_latest_release "portainer/portainer")
 DOCKER_COMPOSE_LATEST_VERSION=$(get_latest_release "docker/compose")
 
 read -r -p "Would you like to add Portainer? <y/N> " prompt
-if echo "$prompt" | grep -Eq "^(y|yes)$"; then
+if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
   msg_info "Installing Portainer $PORTAINER_LATEST_VERSION"
   docker volume create portainer_data >/dev/null
  $STD docker run -d \
@@ -49,7 +49,7 @@ if echo "$prompt" | grep -Eq "^(y|yes)$"; then
 fi
 
 read -r -p "Would you like to add Docker Compose? <y/N> " prompt
-if echo "$prompt" | grep -Eq "^(y|yes)$"; then
+if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
   msg_info "Installing Docker Compose $DOCKER_COMPOSE_LATEST_VERSION"
   DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker}
   mkdir -p $DOCKER_CONFIG/cli-plugins

+ 1 - 1
misc/alpine-install.func

@@ -86,7 +86,7 @@ network_check() {
   if ping -c 1 -W 1 1.1.1.1 &>/dev/null; then msg_ok "Internet Connected"; else
     msg_error "Internet NOT Connected"
     read -r -p "Would you like to continue anyway? <y/N> " prompt
-    if echo "$prompt" | grep -Eq "^(y|yes)$"; then
+    if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
       echo -e " ⚠️  ${RD}Expect Issues Without Internet${CL}"
     else
       echo -e " 🖧  Check Network Settings"