Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84c09480 authored by thilo's avatar thilo
Browse files

- do not display input hint on first attempt

parent 96c8b4b2

bootstrap-commons.sh

+14 −2
Original line number Diff line number Diff line
@@ -28,6 +28,11 @@ function getInputDirectionMessage { 
    echo "$INPUT" | sed 's/^.*;;;;//g'

}



function getQuestion {

    INPUT="$1"

    echo "$INPUT" | sed 's/||||.*$//g'

}



function generateEnvFile {

    QUESTFILE="$1"

    ANSWERFILE="$2"
@@ -44,13 +49,20 @@ function generateEnvFile { 
                then

                    PATTERN=$(getValidationPattern "$VALUE")

                    INPUT_DIRECTION=$(getInputDirectionMessage "$VALUE")

                    echo "$VALUE"

                    QUESTION=$(getQuestion "$VALUE")

                    echo "$QUESTION"

                    if [[ "$PATTERN$INPUT_DIRECTION" = "$VALUE$VALUE" ]]

                    then

                        read INPUT < /dev/tty

                    else

                        FIRST=1

                        while [[ $(echo "$INPUT" | grep -q "$PATTERN" && echo ok || echo nok) = "nok" ]]; do

                            if [[ $FIRST -neq 1 ]]

                            then

                                echo "$INPUT_DIRECTION"

                            else

                                FIRST=0

                            fi

                            read INPUT < /dev/tty

                         :; done

                    fi