From 0302fcf77d0bda2cbb9f43a3450e8f26658c9030 Mon Sep 17 00:00:00 2001 From: Elias Bakken Date: Thu, 6 Jun 2024 13:02:30 +0200 Subject: [PATCH] Do not finish until the cleanup script is done --- Makefile | 2 +- bin/prod/rotate-screen | 2 -- reflash/server.go | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ee95eb3..fdad892 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ run-go: cd reflash; APP_ENV=dev go run main.go server.go screen.go upload-go: - scp reflash/reflash debian@${REMOTE}:/tmp/ + scp reflash/reflash root@${REMOTE}:/usr/local/bin tar: cd zip; tar -zcvf reflash.tar.gz reflash/ diff --git a/bin/prod/rotate-screen b/bin/prod/rotate-screen index 8745f50..822f8e4 100755 --- a/bin/prod/rotate-screen +++ b/bin/prod/rotate-screen @@ -30,7 +30,6 @@ update_xorg(){ XORG_DIR="/mnt/emmc/usr/share/X11/xorg.conf.d" if [ ! -d ${XORG_DIR} ]; then echo "Misssig directory: ${XORG_DIR}" - exit 0 else cat < "${XORG_DIR}/90-monitor.conf" Section "Monitor" @@ -69,7 +68,6 @@ update_weston(){ ;; *) echo "Unknown debian release: '${RELEASE}'" - exit 0 ;; esac fi diff --git a/reflash/server.go b/reflash/server.go index 33c1279..546cf5e 100644 --- a/reflash/server.go +++ b/reflash/server.go @@ -372,7 +372,7 @@ func goUploadMagic() { if err != nil { logError("Error encountered when setting up pipe: \n" + stdout) } - state.State = FINISHED + logInfo("flash-mkfifo done") } func uploadMagicChunk(w http.ResponseWriter, r *http.Request) {