fix tests

AlvinSchiller · Nov 12, 2023 · 3837717 · 3837717
1 parent 47142f7
commit 3837717
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/ci/installation/run_installation_tests.sh b/ci/installation/run_installation_tests.sh
@@ -25,12 +25,11 @@ echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selecti
 # y build local docs
 # n no kiosk mode
 # y install node
-#  rfid reader
-# y dont reboot
+# n dont reboot
 # 'y\n n\n'
 
 
-"$local_install_script_path"/install-jukebox.sh <<< $'y\nn\nn\nn\nn\nn\ny\ny\ny\nn\ny\nn3\ny\n'
+"$local_install_script_path"/install-jukebox.sh <<< $'y\nn\nn\nn\nn\nn\ny\ny\ny\nn\ny\nn\n'
 INSTALLATION_EXITCODE=$?
 
 # count abortion due to "not user pi" as success

diff --git a/installation/install-jukebox.sh b/installation/install-jukebox.sh
@@ -80,8 +80,13 @@ download_jukebox_source() {
 checkPrerequisite
 
 ### RUN INSTALLATION
+cd "${HOME_PATH}"
 INSTALLATION_LOGFILE="${HOME_PATH}/INSTALL-${INSTALL_ID}.log"
-exec 3>&1 1>>"${INSTALLATION_LOGFILE}" 2>&1 || { echo "Cannot create log file. Panic."; exit 1; }
+if [ "$DOCKER_RUNNING" == "true" ]; then
+    exec 3>&1 2>&1
+else
+    exec 3>&1 1>>"${INSTALLATION_LOGFILE}" 2>&1 || { echo "Cannot create log file. Panic."; exit 1; }
+fi
 echo "Log start: ${INSTALL_ID}"
 
 clear 1>&3