diff --git a/.gitignore b/.gitignore index c702e63..d1d1b77 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,6 @@ modules.order Module.symvers Mkfile.old dkms.conf + +env +__pycache__ diff --git a/out/miniRT b/out/miniRT index c3611ad..a383822 100755 Binary files a/out/miniRT and b/out/miniRT differ diff --git a/scripts/run_vnc.sh b/scripts/run_vnc.sh index 3b230b4..9f55aa0 100755 --- a/scripts/run_vnc.sh +++ b/scripts/run_vnc.sh @@ -3,26 +3,26 @@ NOVNC="" XVNC=Xvnc -XVNC_HOST=0.0.0.0 +XVNC_HOST=localhost XVNC_PORT=5901 DISPLAY_WIDTH=$1 DISPLAY_HEIGHT=$2 -DISPLAY=:69 +XVNC_DISPLAY=:69 print_usage() { echo "Usage: run_vnc.sh " } -if command -v novnc_proxy &> /dev/null; then - NOVNC=novnc_proxy -elif command -v novnc &> /dev/null; then - NOVNC=novnc -else - echo "noVNC (novnc_proxy || novnc) not found! Aborting..." - exit 1 -fi +#if command -v novnc_proxy &> /dev/null; then +# NOVNC=novnc_proxy +#elif command -v novnc &> /dev/null; then +# NOVNC=novnc +#else +# echo "noVNC (novnc_proxy || novnc) not found! Aborting..." +# exit 1 +#fi if ! command -v Xvnc &> /dev/null; then echo "Xvnc not found! Aborting..." @@ -43,8 +43,9 @@ $XVNC ${DISPLAY} \ sleep 2 -$NOVNC --vnc localhost:${XVNC_PORT} --listen 7080 & +websockify --web /usr/share/novnc 0.0.0.0:7080 localhost:${XVNC_PORT} & sleep 2 +export DISPLAY=${XVNC_DISPLAY} exec ./out/miniRT