Unverified Commit a09744cf authored by Kroese's avatar Kroese Committed by GitHub
Browse files

Update entry.sh

parent b851336a

src/entry.sh

+10 −20
Original line number Diff line number Diff line
@@ -32,17 +32,16 @@ trap - ERR 
version=$(qemu-system-x86_64 --version | head -n 1 | cut -d '(' -f 1 | awk '{ print $NF }')

info "Booting ${APP}${BOOT_DESC} using QEMU v$version..."



if [ ! -t 1 ] || [ ! -c /dev/tty ]; then

  qemu-system-x86_64 ${ARGS:+ $ARGS} &

else

  qemu-system-x86_64 ${ARGS:+ $ARGS} </dev/tty >/dev/tty | \

  tee "$QEMU_PTY" | \

  sed -u -e 's/\x1B\[[=0-9;]*[a-z]//gi' \

  -e 's/\x1B\x63//g' -e 's/\x1B\[[=?]7l//g' \

  -e '/^$/d' -e 's/\x44\x53\x73//g' \

qemu-system-x86_64 ${ARGS:+ $ARGS} |

  tee "$QEMU_PTY" |

  sed -u \

    -e 's/\x1B\[[=0-9;]*[a-z]//gi' \

    -e 's/\x1B\x63//g' \

    -e 's/\x1B\[[=?]7l//g' \

    -e '/^$/d' \

    -e 's/\x44\x53\x73//g' \

    -e 's/failed to load Boot/skipped Boot/g' \

    -e 's/0): Not Found/0)/g' &

fi



pid=$!

( sleep 30; boot ) &
@@ -53,12 +52,3 @@ wait $pid || rc=$? 


sleep 1 & wait $!

finish "$rc"
 


#

#tail -fn +0 "$QEMU_LOG" --pid=$$ 2>/dev/null &

#cat "$QEMU_TERM" 2> /dev/null | tee "$QEMU_PTY" | \

#sed -u -e 's/\x1B\[[=0-9;]*[a-z]//gi' \

#-e 's/\x1B\x63//g' -e 's/\x1B\[[=?]7l//g' \

#-e '/^$/d' -e 's/\x44\x53\x73//g' \

#-e 's/failed to load Boot/skipped Boot/g' \

#-e 's/0): Not Found/0)/g' & wait $! || :