[pnpm] use oncreate.sh

Author: joshuanianji

src/mount-pnpm-store/devcontainer-feature.json

@@ -17,5 +17,7 @@
         "ghcr.io/devcontainers/features/common-utils",
         "ghcr.io/meaningful-ooo/devcontainer-features/fish"
     ],
-    "postCreateCommand": "/usr/local/share/mount-pnpm-store-post-create.sh"
+    "onCreateCommand": {
+        "mount-pnpm-store-setup": "/usr/local/share/mount-pnpm-store-setup/scripts/oncreate.sh"
+    }
 }

src/mount-pnpm-store/install.sh

@@ -1,55 +1,51 @@
 #!/bin/sh
-set -e
-
-FEATURE_ID="mount-pnpm-store"
 
-echo "Activating feature '$FEATURE_ID'"
-echo "User: ${_REMOTE_USER}     User home: ${_REMOTE_USER_HOME}"
-
-if [ -z "$_REMOTE_USER" ] || [ -z "$_REMOTE_USER_HOME" ]; then
-    echo "***********************************************************************************"
-    echo "*** Require _REMOTE_USER and _REMOTE_USER_HOME to be set (by dev container CLI) ***"
-    echo "***********************************************************************************"
-    exit 1
-fi
-
-# make /dc/mounted-pnpm-store folder if doesn't exist
-mkdir -p "/dc/mounted-pnpm-store"
-
-# as to why we move around the folder, check `github-cli-persistence/install.sh`
-if [ -e "$_REMOTE_USER_HOME/.pnpm-store" ]; then
-    echo "Moving existing .pnpm-store folder to .pnpm-store-old"
-    mv "$_REMOTE_USER_HOME/.pnpm-store" "$_REMOTE_USER_HOME/.pnpm-store-old"
-fi
-
-ln -s /dc/mounted-pnpm-store "$_REMOTE_USER_HOME/.pnpm-store"
-chown -R "$_REMOTE_USER:$_REMOTE_USER" "$_REMOTE_USER_HOME/.pnpm-store"
-
-# --- Generate a '$FEATURE_ID-post-create.sh' script to be executed by the 'postCreateCommand' lifecycle hook
-# Looks like this is the best way to run a script in lifecycle hooks
-# Source: https://github.com/devcontainers/features/blob/562305d37b97d47331d96306ffc2a0a3cce55e64/src/git-lfs/install.sh#L190C1-L190C109
-POST_CREATE_SCRIPT_PATH="/usr/local/share/$FEATURE_ID-post-create.sh"
-
-tee "$POST_CREATE_SCRIPT_PATH" >/dev/null \
-    <<'EOF'
-#!/bin/sh
+USERNAME=${USERNAME:-${_REMOTE_USER}}
+LIFECYCLE_SCRIPTS_DIR="/usr/local/share/${FEATURE_ID}/scripts"
 
 set -e
 
-# set pnpm config (if it's installed)
-if type pnpm >/dev/null 2>&1; then
-    echo "Setting pnpm store location to $_REMOTE_USER_HOME/.pnpm-store"
-    pnpm config set store-dir ~/.pnpm-store --global
-else
-    echo "WARN: pnpm is not installed! Please ensure pnpm is installed and in your PATH."
-    echo "WARN: pnpm store location will not be set."
-fi
-
-# if the user is not root, chown /dc/mounted-pnpm-store to the user
-if [ "$(id -u)" != "0" ]; then
-    echo "Running post-start.sh for user $USER"
-    sudo chown -R "$USER:$USER" /dc/mounted-pnpm-store
+create_cache_dir() {
+    if [ -d "$1" ]; then
+        echo "Cache directory $1 already exists. Skip creation..."
+    else
+        echo "Create cache directory $1..."
+        mkdir -p "$1"
+    fi
+
+    if [ -z "$2" ]; then
+        echo "No username provided. Skip chown..."
+    else
+        echo "Change owner of $1 to $2..."
+        chown -R "$2:$2" "$1"
+    fi
+}
+
+create_symlink_dir() {
+    local local_dir=$1
+    local cache_dir=$2
+    local username=$3
+
+    runuser -u "$username" -- mkdir -p "$(dirname "$local_dir")"
+    runuser -u "$username" -- mkdir -p "$cache_dir"
+
+    # if the folder we want to symlink already exists, the ln -s command will create a folder inside the existing folder
+    if [ -e "$local_dir" ]; then
+        echo "Moving existing $local_dir folder to $local_dir-old"
+        mv "$local_dir" "$local_dir-old"
+    fi
+
+    echo "Symlink $local_dir to $cache_dir for $username..."
+    runuser -u "$username" -- ln -s "$cache_dir" "$local_dir"
+}
+
+create_cache_dir "/dc/mounted-pnpm-store" "${USERNAME}"
+create_symlink_dir "$_REMOTE_USER_HOME/.pnpm-store" "/dc/mounted-pnpm-store" "${USERNAME}"
+
+# Set Lifecycle scripts
+if [ -f oncreate.sh ]; then
+    mkdir -p "${LIFECYCLE_SCRIPTS_DIR}"
+    cp oncreate.sh "${LIFECYCLE_SCRIPTS_DIR}/oncreate.sh"
 fi
-EOF
 
-chmod 755 "$POST_CREATE_SCRIPT_PATH"
+echo "Finished installing $FEATURE_ID"

src/mount-pnpm-store/oncreate.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+# set pnpm config (if it's installed)
+if type pnpm >/dev/null 2>&1; then
+    echo "Setting pnpm store location to $_REMOTE_USER_HOME/.pnpm-store"
+    pnpm config set store-dir ~/.pnpm-store --global
+else
+    echo "WARN: pnpm is not installed! Please ensure pnpm is installed and in your PATH."
+    echo "WARN: pnpm store location will not be set."
+fi
+
+# if the user is not root, chown /dc/mounted-pnpm-store to the user
+if [ "$(id -u)" != "0" ]; then
+    echo "Running post-start.sh for user $USER"
+    sudo chown -R "$USER:$USER" /dc/mounted-pnpm-store
+fi