Cleanup PATH

Dockerfile

@@ -184,8 +184,8 @@ RUN dpkg --add-architecture i386 && \
     }\n\
 }" > /usr/share/glvnd/egl_vendor.d/10_nvidia.json
 # Expose NVIDIA libraries and paths
-ENV PATH /usr/local/nvidia/bin:${PATH}
-ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu:/usr/lib/i386-linux-gnu${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}:/usr/local/nvidia/lib:/usr/local/nvidia/lib64
+ENV PATH /usr/local/nvidia/bin${PATH:+:${PATH}}
+ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}/usr/local/nvidia/lib:/usr/local/nvidia/lib64
 # Make all NVIDIA GPUs visible by default
 ENV NVIDIA_VISIBLE_DEVICES all
 # All NVIDIA driver capabilities should preferably be used, check `NVIDIA_DRIVER_CAPABILITIES` inside the container if things do not work

entrypoint.sh

@@ -19,9 +19,9 @@ sudo rm -rf /tmp/.X* ~/.cache
 # Change time zone from environment variable
 sudo ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime && echo "$TZ" | sudo tee /etc/timezone > /dev/null
 # Add Lutris directories to path
-export PATH="${PATH}:/usr/local/games:/usr/games"
+export PATH="${PATH:+${PATH}:}/usr/local/games:/usr/games"
 # Add LibreOffice to library path
-export LD_LIBRARY_PATH="/usr/lib/libreoffice/program:${LD_LIBRARY_PATH}"
+export LD_LIBRARY_PATH="/usr/lib/libreoffice/program${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
 
 # This symbolic link enables running Xorg inside a container with `-sharevts`
 sudo ln -snf /dev/ptmx /dev/tty7

selkies-gstreamer-entrypoint.sh

@@ -8,7 +8,7 @@
 . /opt/gstreamer/gst-env
 
 # Set default display
-export DISPLAY="${DISPLAY:-\:0}"
+export DISPLAY="${DISPLAY:-:0}"
 
 # Configure joystick interposer
 sudo mkdir -pm755 /dev/input
@@ -17,7 +17,7 @@ sudo touch /dev/input/{js0,js1,js2,js3}
 # Show debug logs for GStreamer
 export GST_DEBUG="${GST_DEBUG:-*:2}"
 # Set password for basic authentication
-if [ "${ENABLE_BASIC_AUTH,,}" = "true" ] && [ -z "$BASIC_AUTH_PASSWORD" ]; then export BASIC_AUTH_PASSWORD="$PASSWD"; fi
+if [ "${ENABLE_BASIC_AUTH,,}" = "true" ] && [ -z "${BASIC_AUTH_PASSWORD}" ]; then export BASIC_AUTH_PASSWORD="${PASSWD}"; fi
 
 # Wait for X11 to start
 echo "Waiting for X socket"