diff --git a/craftenv.sh b/craftenv.sh
index 235aa24c1..525e61914 100644
--- a/craftenv.sh
+++ b/craftenv.sh
@@ -1,90 +1,86 @@
 craftRoot="${BASH_SOURCE[0]}"
 if [[ -z "$craftRoot" ]];then
     craftRoot="$0"
 fi
 if [[ -z "$craftRoot" ]];then
     craftRoot="$_"
 fi
 if [[ -z "$craftRoot" ]];then
     echo "Failed to determine interpreter"
     exit 1
 fi
 
 if command -v python3.7 >/dev/null; then
     CRAFT_PYTHON_BIN=$(command -v python3.7)
 elif command -v python3.6 >/dev/null; then
     CRAFT_PYTHON_BIN=$(command -v python3.6)
 else
     # could not find python 3.6, try python3
     if ! command -v python3 >/dev/null; then
         echo "Failed to python Python 3.6+"
         exit 1
     fi
     # check if python3 is at least version 3.6:
     python_version=$(python3 --version)
     # sort and use . as separator and then check if the --version output is sorted later
     # Note: this is just a sanity check. craft.py should check sys.version
     comparison=$(printf '%s\nPython 3.6.0\n' "$python_version" | sort -t.)
     if [ "$(echo "${comparison}" | head -n1)" != "Python 3.6.0" ]; then
         echo "Found Python3 version ${python_version} is too old. Need at least 3.6"
         exit 1
     fi
     CRAFT_PYTHON_BIN=$(command -v python3)
 fi
 export CRAFT_PYTHON_BIN
 
 if [[ ! -d "$craftRoot" ]]; then
     craftRoot=$(${CRAFT_PYTHON_BIN} -c "import os; import sys; print(os.path.dirname(os.path.abspath(sys.argv[1])));" "$craftRoot")
 fi
 
 export craftRoot
-if [ -n "$PS1" ]; then
+if [[ -n "$PS1" ]]; then
     export PS1="CRAFT: $PS1"
 fi
 
 CRAFT_ENV=$(${CRAFT_PYTHON_BIN} "$craftRoot/bin/CraftSetupHelper.py" --setup)
-# Split the CraftSetupHelper.py output by newlines instead of any whitespace
-# to also handled environment variables containing spaces (e.g. $PS1)
-# See https://stackoverflow.com/q/24628076/894271
 function export_lines() {
-    local IFS=$'\n'
-    local lines=($1)
+    local lines=($(echo ${1} | sed 's/\n/ /g'))
     local i
     for (( i=0; i<${#lines[@]}; i++ )) ; do
         local line=${lines[$i]}
         if [[ "$line"  =~ "=" ]] && [[ $line != _=* ]] ; then
             export "$line" || true
         fi
     done
 }
 export_lines "$CRAFT_ENV"
 
 craft() {
     ${CRAFT_PYTHON_BIN} "$craftRoot/bin/craft.py" $@
 }
 
 cs() {
     dir=$(craft -q --ci-mode --get "sourceDir()" $1)
     if (($? > 0));then
         echo $dir
     else
         cd "$dir"
     fi
 }
 
 cb() {
     dir=$(craft -q --ci-mode --get "buildDir()" $1)
     if (($? > 0));then
         echo $dir
     else
         cd "$dir"
     fi
 }
 
 cr() {
     cd "$KDEROOT"
 }
 
 cr
 
 declare -x -F cs cb cr