diff --git a/Makefile b/Makefile index 9dc7161..25f0bc1 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ OBJDIR := $(OBJDIR_BASE)/native endif -VNC_SCRIPT := ./script/run_vnc.sh +VNC_SCRIPT := ./scripts/run_vnc.sh SCENEDIR := scene SRCSCENE := $(addprefix $(SCENEDIR)/, $(addsuffix .c,\ diff --git a/miniRT b/miniRT new file mode 100755 index 0000000..962356a Binary files /dev/null and b/miniRT differ diff --git a/scripts/run_vnc.sh b/scripts/run_vnc.sh index 27b397c..1f1264f 100755 --- a/scripts/run_vnc.sh +++ b/scripts/run_vnc.sh @@ -1,5 +1,7 @@ #!/bin/bash +NOVNC="" + XVNC=Xvnc XVNC_HOST=0.0.0.0 XVNC_PORT=5901 @@ -7,8 +9,16 @@ XVNC_PORT=5901 DISPLAY_WIDTH=$1 DISPLAY_HEIGHT=$2 -if ! command -v novnc_proxy &> /dev/null; then - echo "noVNC (novnc_proxy) not found! Aborting..." +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 @@ -17,6 +27,11 @@ if ! command -v Xvnc &> /dev/null; then exit 1 fi +if [[ "$DISPLAY_WIDTH" = "" || "$DISPLAY_HEIGHT" = "" ]] ; then + print_usage + exit 1 +fi + $XVNC :1 \ -geometry ${DISPLAY_WIDTH}x${DISPLAY_HEIGHT} \ -depth 24 \ @@ -26,7 +41,7 @@ $XVNC :1 \ sleep 2 -novnc_proxy --vnc localhost:${XVNC_PORT} & +$NOVNC --vnc localhost:${XVNC_PORT} & sleep 2