From 7902192fcbff497049895a6ad88de096ba2acac8 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Mon, 6 May 2019 12:48:37 +0200
Subject: [PATCH] Trim whitespace from input (fixes #1)

---
 bootstrap-commons.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/bootstrap-commons.sh b/bootstrap-commons.sh
index d5c12e8..7e22426 100644
--- a/bootstrap-commons.sh
+++ b/bootstrap-commons.sh
@@ -33,6 +33,11 @@ function getQuestion {
     echo "$INPUT" | sed 's/||||.*$//g'
 }
 
+function readInput {
+    read INPUT < /dev/tty
+    echo $INPUT | awk '{$1=$1};1'
+}
+
 function generateEnvFile {
     QUESTFILE="$1"
     ANSWERFILE="$2"
@@ -53,7 +58,7 @@ function generateEnvFile {
                     echo "$QUESTION"
                     if [[ "$PATTERN$INPUT_DIRECTION" = "$VALUE$VALUE" ]]
                     then
-                        read INPUT < /dev/tty
+                        INPUT=$(readInput)
                     else
                         FIRST=1
                         while [[ $(echo "$INPUT" | grep -q -P "$PATTERN" && echo ok || echo nok) = "nok" ]]; do
@@ -63,7 +68,7 @@ function generateEnvFile {
                             else
                                 FIRST=0
                             fi
-                            read INPUT < /dev/tty
+                            INPUT=$(readInput)
                          :; done
                     fi
                     echo "$KEY=$INPUT" >> "$ENVFILE"
@@ -78,4 +83,4 @@ function generateEnvFile {
             echo "$KEY=$VALUE" >> "$ENVFILE"
          fi
     :;done <<< "$(grep -v \# ${QUESTFILE} | sed '/^$/d'| sed 's/=/        /g')"
-}
\ No newline at end of file
+}
-- 
GitLab