use containerWorkspaceFolder var and pass it to setup.sh (#12)

- folder name inside dev container is same as folder name on host
  so if it differs from qmk_userspace then setup.sh cannot be found
  and it sets incorrect user.overlay_dir
- docs https://containers.dev/implementors/json_reference/

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 2b7b817a40d3f1b2b872358e21571ba65309b2cc..7aaee1fda158321200d16f3ec9108af6c0720850 100644 (file)
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -17,7 +17,7 @@
             ]
         }
     },
-    "postCreateCommand": "/workspaces/qmk_userspace/.devcontainer/setup.sh"
+    "postCreateCommand": "${containerWorkspaceFolder}/.devcontainer/setup.sh ${containerWorkspaceFolder}"
 
     // Features to add to the dev container. More info: https://containers.dev/features.
     // "features": {},

diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh
index 25c7c5ee9dc2bdde6082bdc75fb946cf0b97187b..9155c6ccad34faa68cf093bb51ca6663452de2bf 100755 (executable)
--- a/.devcontainer/setup.sh
+++ b/.devcontainer/setup.sh
@@ -9,13 +9,15 @@ rm get-pip.py
 
 python3 -m pip install --upgrade milc
 
-git config --global --add safe.directory /workspaces/qmk_userspace
+userspacePath="$1"
+
+git config --global --add safe.directory "$userspacePath"
 git submodule update --init --recursive
 
 [ -d /workspaces/qmk_firmware ] || git clone https://github.com/qmk/qmk_firmware.git /workspaces/qmk_firmware
 git config --global --add safe.directory /workspaces/qmk_firmware
 
 qmk config user.qmk_home=/workspaces/qmk_firmware
-qmk config user.overlay_dir=/workspaces/qmk_userspace
+qmk config user.overlay_dir="$userspacePath"
 
 qmk git-submodule