fixed extra lines in openhabian.conf.dist

Signed-off-by: Markus Storm <[email protected]>

build-image/first-boot.bash

@@ -29,6 +29,7 @@ sed -i 's/\r$//' /etc/openhabian.conf
 source "$CONFIGFILE"
 echo "OK"
 
+# shellcheck disable=SC2154
 if [[ "$debugmode" == "default" ]]; then
   unset SILENT
   unset DEBUGMAX
@@ -187,7 +188,7 @@ sleep 12
 if hash python3 2>/dev/null; then bash /boot/webif.bash cleanup; fi
 
 if [ -z "$SILENT" ]; then
-  echo -e "\n\e[36mMemory usage:"
+  echo -e "\\n\\e[36mMemory usage:"
   free -m && ps -auxq "$(cat /var/lib/openhab2/tmp/karaf.pid)" |awk '/openhab/ {print "size/res="$5"/"$6" KB"}'
 fi
 

functions/helpers.bash

@@ -207,7 +207,7 @@ tryUntil() {
   local i=$count
   interval=${3:-1}
   until [ "$i" -le 0 ]; do
-    cond_echo "Executing ${cmd}"
+    cond_echo -n "(executing ${cmd})"
     eval "${cmd}"
     ret=$?
     if [ $ret -eq 0 ]; then break; fi

openhabian.conf.dist

@@ -55,6 +55,3 @@ debugmode=on
 java_opt=Zulu64
 
 # vim: filetype=sh
-username=openhabian
-userpw=openhabian
-# Fill in your SSID and password below, leave empty to use ethernet