Fetched template changes

quickplates · Mar 26, 2024 · 8f9e220 · 8f9e220
1 parent c12aea6
commit 8f9e220
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 34 deletions.
diff --git a/.copier-answers.yaml b/.copier-answers.yaml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: 0.6.0
+_commit: 0.7.0
 _src_path: gh:quickplates/meta
 accountname: quickplates
 description: Protocol Buffers API template 📜

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -4,7 +4,12 @@
     // Docker context to use, relative to this file
     "context": "image/",
     // Dockerfile to use, relative to this file
-    "dockerfile": "image/Dockerfile"
+    "dockerfile": "image/Dockerfile",
+    // Build options
+    "options": [
+      // Use host network
+      "--network=host"
+    ]
   },
   // Tool-specific settings
   "customizations": {

diff --git a/.devcontainer/image/hooks/create.sh b/.devcontainer/image/hooks/create.sh
@@ -13,10 +13,10 @@ if [[ -s /secrets/.ghtoken && -r /secrets/.ghtoken ]]; then
 	configfile="${confighome}/nix/nix.conf"
 	tmpfile="$(mktemp)"
 
-	mkdir -p "$(dirname "${configfile}")"
+	mkdir --parents "$(dirname "${configfile}")"
 	touch "${configfile}"
 
-	if grep -q extra-access-tokens "${configfile}"; then
+	if grep --quiet extra-access-tokens "${configfile}"; then
 		sed "s|extra-access-tokens.*|extra-access-tokens = github.com=${token}|" "${configfile}" >"${tmpfile}"
 		cat "${tmpfile}" >"${configfile}"
 		rm "${tmpfile}"

diff --git a/.devcontainer/image/setup.sh b/.devcontainer/image/setup.sh
@@ -2,10 +2,10 @@
 
 REMOTE_USER="${REMOTE_USER:?}"
 REMOTE_USER_PASSWD="$(getent passwd "${REMOTE_USER}")"
-REMOTE_USER_HOME="$(echo "${REMOTE_USER_PASSWD}" | cut -d: -f6)"
+REMOTE_USER_HOME="$(echo "${REMOTE_USER_PASSWD}" | cut --delimiter ':' --fields 6)"
 
 # Setup default shell
-chsh -s /usr/bin/zsh "${REMOTE_USER}"
+chsh --shell /usr/bin/zsh "${REMOTE_USER}"
 
 # Setup direnv
 cat <<EOF >>"${REMOTE_USER_HOME}/.bashrc"
@@ -26,17 +26,17 @@ eval "\$(starship init zsh)"
 EOF
 
 # Setup secrets directory
-mkdir -p /secrets/
+mkdir --parents /secrets/
 
-chown -R "${REMOTE_USER}:" /secrets/
+chown --recursive "${REMOTE_USER}:" /secrets/
 
 # Setup shell history cache
-mkdir -p /persist/shellhistory/
+mkdir --parents /persist/shellhistory/
 
 touch /persist/shellhistory/.bash_history
 touch /persist/shellhistory/.zsh_history
 
-chown -R "${REMOTE_USER}:" /persist/shellhistory/
+chown --recursive "${REMOTE_USER}:" /persist/shellhistory/
 
 cat <<EOF >>"${REMOTE_USER_HOME}/.bashrc"
 export HISTFILE=/persist/shellhistory/.bash_history
@@ -47,9 +47,9 @@ export HISTFILE=/persist/shellhistory/.zsh_history
 EOF
 
 # Setup trunk cache
-mkdir -p /cache/trunk/
+mkdir --parents /cache/trunk/
 
-chown -R "${REMOTE_USER}:" /cache/trunk/
+chown --recursive "${REMOTE_USER}:" /cache/trunk/
 
 cat <<EOF >>"${REMOTE_USER_HOME}/.bashrc"
 export TRUNK_CACHE=/cache/trunk/

diff --git a/.github/workflows/example.yaml b/.github/workflows/example.yaml
@@ -95,7 +95,7 @@ jobs:
         if: "!cancelled()"
         run: >
           mkdir
-          -p
+          --parents
           ${{ env.NIX_CACHE_DIR }}
           &&
           nix-store
@@ -117,7 +117,7 @@ jobs:
       - name: Extract archive
         run: >
           mkdir
-          -p
+          --parents
           build/
           &&
           tar
@@ -173,7 +173,7 @@ jobs:
       - name: Copy build output
         run: >
           cp
-          -r
+          --recursive
           build/.
           example/
       - name: Add changes

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -97,7 +97,7 @@ jobs:
         if: "!cancelled()"
         run: >
           mkdir
-          -p
+          --parents
           ${{ env.NIX_CACHE_DIR }}
           &&
           nix-store

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -86,7 +86,7 @@ jobs:
         if: "!cancelled()"
         run: >
           mkdir
-          -p
+          --parents
           ${{ env.NIX_CACHE_DIR }}
           &&
           nix-store

diff --git a/src/{% if docs %}docs{% endif %}/package.json b/src/{% if docs %}docs{% endif %}/package.json
@@ -7,10 +7,10 @@
     "predocs": "npm run generate",
     "docs": "docusaurus",
     "update": "ncu --peer --doctor --upgrade && npm i --no-audit --no-fund",
-    "postupdate": "rm -rf .tmp/",
+    "postupdate": "rm --recursive --force .tmp/",
     "pretest": "npm run generate",
     "test": "docusaurus build --out-dir .tmp/",
-    "posttest": "rm -rf .tmp/"
+    "posttest": "rm --recursive --force .tmp/"
   },
   "engines": {
     "node": ">=18.0"

diff --git a/src/{% if true %}.devcontainer{% endif %}/devcontainer.json.jinja b/src/{% if true %}.devcontainer{% endif %}/devcontainer.json.jinja
@@ -4,7 +4,12 @@
     // Docker context to use, relative to this file
     "context": "image/",
     // Dockerfile to use, relative to this file
-    "dockerfile": "image/Dockerfile"
+    "dockerfile": "image/Dockerfile",
+    // Build options
+    "options": [
+      // Use host network
+      "--network=host"
+    ]
   },
   // Tool-specific settings
   "customizations": {

diff --git a/src/{% if true %}.devcontainer{% endif %}/image/hooks/create.sh b/src/{% if true %}.devcontainer{% endif %}/image/hooks/create.sh
@@ -13,10 +13,10 @@ if [[ -s /secrets/.ghtoken && -r /secrets/.ghtoken ]]; then
 	configfile="${confighome}/nix/nix.conf"
 	tmpfile="$(mktemp)"
 
-	mkdir -p "$(dirname "${configfile}")"
+	mkdir --parents "$(dirname "${configfile}")"
 	touch "${configfile}"
 
-	if grep -q extra-access-tokens "${configfile}"; then
+	if grep --quiet extra-access-tokens "${configfile}"; then
 		sed "s|extra-access-tokens.*|extra-access-tokens = github.com=${token}|" "${configfile}" >"${tmpfile}"
 		cat "${tmpfile}" >"${configfile}"
 		rm "${tmpfile}"

diff --git a/src/{% if true %}.devcontainer{% endif %}/image/setup.sh.jinja b/src/{% if true %}.devcontainer{% endif %}/image/setup.sh.jinja
@@ -2,10 +2,10 @@
 
 REMOTE_USER="${REMOTE_USER:?}"
 REMOTE_USER_PASSWD="$(getent passwd "${REMOTE_USER}")"
-REMOTE_USER_HOME="$(echo "${REMOTE_USER_PASSWD}" | cut -d: -f6)"
+REMOTE_USER_HOME="$(echo "${REMOTE_USER_PASSWD}" | cut --delimiter ':' --fields 6)"
 
 # Setup default shell
-chsh -s /usr/bin/zsh "${REMOTE_USER}"
+chsh --shell /usr/bin/zsh "${REMOTE_USER}"
 
 # Setup direnv
 cat <<EOF >>"${REMOTE_USER_HOME}/.bashrc"
@@ -26,17 +26,17 @@ eval "\$(starship init zsh)"
 EOF
 
 # Setup secrets directory
-mkdir -p /secrets/
+mkdir --parents /secrets/
 
-chown -R "${REMOTE_USER}:" /secrets/
+chown --recursive "${REMOTE_USER}:" /secrets/
 
 # Setup shell history cache
-mkdir -p /persist/shellhistory/
+mkdir --parents /persist/shellhistory/
 
 touch /persist/shellhistory/.bash_history
 touch /persist/shellhistory/.zsh_history
 
-chown -R "${REMOTE_USER}:" /persist/shellhistory/
+chown --recursive "${REMOTE_USER}:" /persist/shellhistory/
 
 cat <<EOF >>"${REMOTE_USER_HOME}/.bashrc"
 export HISTFILE=/persist/shellhistory/.bash_history
@@ -47,9 +47,9 @@ export HISTFILE=/persist/shellhistory/.zsh_history
 EOF
 
 # Setup trunk cache
-mkdir -p /cache/trunk/
+mkdir --parents /cache/trunk/
 
-chown -R "${REMOTE_USER}:" /cache/trunk/
+chown --recursive "${REMOTE_USER}:" /cache/trunk/
 
 cat <<EOF >>"${REMOTE_USER_HOME}/.bashrc"
 export TRUNK_CACHE=/cache/trunk/
@@ -61,9 +61,9 @@ EOF
 {%- if docs %}
 
 # Setup npm cache
-mkdir -p /cache/npm/
+mkdir --parents /cache/npm/
 
-chown -R "${REMOTE_USER}:" /cache/npm/
+chown --recursive "${REMOTE_USER}:" /cache/npm/
 
 cat <<EOF >>"${REMOTE_USER_HOME}/.bashrc"
 export NPM_CONFIG_CACHE=/cache/npm/

diff --git a/src/{% if true %}.github{% endif %}/workflows/lint.yaml.jinja b/src/{% if true %}.github{% endif %}/workflows/lint.yaml.jinja
@@ -104,7 +104,7 @@ jobs:
         if: "!cancelled()"
         run: >
           mkdir
-          -p
+          --parents
           {{ '${{ env.NIX_CACHE_DIR }}' }}
           &&
           nix-store

diff --git a/src/{% if true %}.github{% endif %}/workflows/{% if docs %}docs.yaml{% endif %} b/src/{% if true %}.github{% endif %}/workflows/{% if docs %}docs.yaml{% endif %}
@@ -88,7 +88,7 @@ jobs:
         if: "!cancelled()"
         run: >
           mkdir
-          -p
+          --parents
           ${{ env.NIX_CACHE_DIR }}
           &&
           nix-store