Skip to content

Commit

Permalink
devcontainer: fix display override (#30041)
Browse files Browse the repository at this point in the history
* Fix display override on mac

* Add newline
  • Loading branch information
fredyshox authored Sep 25, 2023
1 parent 51674f6 commit 2fc307c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .devcontainer/container_post_create.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#!/usr/bin/env bash

TARGET_USER=batman
source .devcontainer/.host/.env

# override display flag for mac
if [[ $HOST_OS == darwin ]]; then
echo "Setting up DISPLAY override for macOS..."
cat <<EOF >> /root/.bashrc
cat <<EOF >> /home/$TARGET_USER/.bashrc
if [ -n "\$DISPLAY" ]; then
DISPLAY_NUM=\$(echo "\$DISPLAY" | awk -F: '{print \$NF}')
export DISPLAY=host.docker.internal:\$DISPLAY_NUM
Expand All @@ -15,6 +16,5 @@ fi

# These lines are temporary, to remain backwards compatible with old devcontainers
# that were running as root and therefore had their caches written as root
USER=batman
sudo chown -R $USER: /tmp/scons_cache
sudo chown -R $USER: /tmp/comma_download_cache
sudo chown -R $TARGET_USER: /tmp/scons_cache
sudo chown -R $TARGET_USER: /tmp/comma_download_cache

0 comments on commit 2fc307c

Please sign in to comment.