Merge branch 'main' into python-3.10

gantsign · Nov 16, 2024 · 5375fdf · 5375fdf
2 parents 1c5beb1 + 3a1163b
commit 5375fdf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/devcontainer-base/Dockerfile b/devcontainer-base/Dockerfile
@@ -174,14 +174,15 @@ RUN VERSION="`curl -fsSL -H 'Accept: application/vnd.github.v3+json' https://api
 # Install sd
 RUN VERSION="`curl -fsSL -H 'Accept: application/vnd.github.v3+json' https://api.github.com/repos/chmln/sd/releases \
         | jq --raw-output '[.[] | select(.prerelease == false)] | .[0].tag_name'`" \
-    && URL="https://raw.githubusercontent.com/chmln/sd/${VERSION}/LICENSE" \
-    && mkdir -p /usr/local/share/sd \
-    && curl -fsSL --output /usr/local/share/sd/LICENSE "${URL}" \
     && URL="`curl -fsSL -H 'Accept: application/vnd.github.v3+json' https://api.github.com/repos/chmln/sd/releases \
-        | jq --raw-output \"[.[] | select(.prerelease == false)] | .[] | select(.tag_name == \\\"${VERSION}\\\") | .assets | .[] | .browser_download_url | select(test(\\\"x86_64-unknown-linux-gnu\$\\\"))\"`" \
-    && curl -fsSL --output /usr/local/share/sd/sd "${URL}" \
-    && chmod +x /usr/local/share/sd/sd \
-    && ln -sf /usr/local/share/sd/sd /usr/local/bin/sd
+        | jq --raw-output \"[.[] | select(.prerelease == false)] | .[] | select(.tag_name == \\\"${VERSION}\\\") | .assets | .[] | .browser_download_url | select(test(\\\"x86_64-unknown-linux-gnu.tar.gz\$\\\"))\"`" \
+    && curl -fsSL --output tmp.tar.gz "${URL}" \
+    && mkdir -p /usr/local/share/sd \
+    && tar --strip-components=1 -C /usr/local/share/sd -xvf tmp.tar.gz \
+    && rm -f tmp.tar.gz \
+    && ln -sf /usr/local/share/sd/sd /usr/local/bin/sd \
+    && mkdir -p /usr/local/share/zsh/plugins/sd \
+    && ln -sf /usr/local/share/sd/completions/_sd /usr/local/share/zsh/plugins/sd/_sd
 
 # Install starship
 RUN VERSION="`curl -fsSL -H 'Accept: application/vnd.github.v3+json' https://api.github.com/repos/starship/starship/releases \
@@ -200,7 +201,7 @@ RUN VERSION="`curl -fsSL -H 'Accept: application/vnd.github.v3+json' https://api
 
 # Install tokei
 RUN VERSION="`curl -fsSL -H 'Accept: application/vnd.github.v3+json' https://api.github.com/repos/XAMPPRocky/tokei/releases \
-        | jq --raw-output '[.[] | select(.prerelease == false)] | .[0].tag_name'`" \
+        | jq --raw-output '[.[] | select(.prerelease == false) | select(.tag_name | index("alpha") | not)] | .[0].tag_name'`" \
     && URL="https://raw.githubusercontent.com/XAMPPRocky/tokei/${VERSION}/LICENCE-MIT" \
     && mkdir -p /usr/local/share/tokei \
     && curl -fsSL --output /usr/local/share/tokei/LICENSE "${URL}" \

diff --git a/devcontainer-base/zimrc.zsh b/devcontainer-base/zimrc.zsh
@@ -11,6 +11,7 @@ zmodule ohmyzsh/ohmyzsh --root plugins \
 
 zmodule '/usr/local/share/zsh/plugins' \
     -f 'procs' \
+    -f 'sd' \
     -f 'starship'
 
 if [ -f ~/.config/zsh/zim_before_compinit.zsh ]; then