Skip to content

Commit

Permalink
style(pre-commit): autofix
Browse files Browse the repository at this point in the history
  • Loading branch information
pre-commit-ci[bot] committed Jan 2, 2025
1 parent f7337c8 commit 79d8a6f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docker/tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,4 @@ COPY docker/tools/etc/xstartup /root/.vnc/xstartup
COPY docker/tools/etc/entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh && chmod +x /root/.vnc/xstartup
ENTRYPOINT ["/entrypoint.sh"]
CMD ["/bin/bash"]
CMD ["/bin/bash"]
12 changes: 6 additions & 6 deletions docker/tools/etc/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
configure_vnc() {
# Create Openbox application configuration
mkdir -p /etc/xdg/openbox
cat > /etc/xdg/openbox/rc.xml << 'EOF'
cat >/etc/xdg/openbox/rc.xml <<'EOF'
<?xml version="1.0" encoding="UTF-8"?>
<openbox_config xmlns="http://openbox.org/3.4/rc"
xmlns:xi="http://www.w3.org/2001/XInclude">
Expand All @@ -21,7 +21,7 @@ configure_vnc() {
</openbox_config>
EOF
# Create rviz2 start script
cat > /usr/local/bin/start-rviz2.sh << 'EOF'
cat >/usr/local/bin/start-rviz2.sh <<'EOF'
#!/bin/bash
source /opt/ros/humble/setup.bash
source /opt/autoware/setup.bash
Expand All @@ -32,8 +32,8 @@ else
fi
EOF
chmod +x /usr/local/bin/start-rviz2.sh
echo "echo 'Autostart executed at $(date)' >> /tmp/autostart.log" >> /etc/xdg/openbox/autostart
echo "/usr/local/bin/start-rviz2.sh" >> /etc/xdg/openbox/autostart
echo "echo 'Autostart executed at $(date)' >> /tmp/autostart.log" >>/etc/xdg/openbox/autostart
echo "/usr/local/bin/start-rviz2.sh" >>/etc/xdg/openbox/autostart

# Start VNC server with Openbox
echo "Starting VNC server with Openbox..."
Expand All @@ -47,7 +47,7 @@ EOF

# Set the DISPLAY variable to match VNC server
echo "Setting DISPLAY to :99"
echo "export DISPLAY=:99" >> ~/.bashrc
echo "export DISPLAY=:99" >>~/.bashrc
sleep 2

# Start NoVNC
Expand Down Expand Up @@ -79,4 +79,4 @@ EOF
[ "$VNC_ENABLED" == "true" ] && configure_vnc
source "/opt/ros/$ROS_DISTRO/setup.bash"
source "/opt/autoware/setup.bash"
exec "$@"
exec "$@"
2 changes: 1 addition & 1 deletion docker/tools/etc/xstartup
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ echo "Starting Openbox window manager..."
openbox-session &

# Keep the session alive
sleep infinity
sleep infinity

0 comments on commit 79d8a6f

Please sign in to comment.