feat: use kitty-terminfo from unstable

hanoii · May 12, 2024 · 21a7be9 · 21a7be9
1 parent 1c5d2f5
commit 21a7be9
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/.ddev/addon-metadata/pimp-my-shell/manifest.yaml b/.ddev/addon-metadata/pimp-my-shell/manifest.yaml
@@ -1,7 +1,7 @@
 name: pimp-my-shell
 repository: .
 version: ""
-install_date: "2024-05-10T16:00:54-03:00"
+install_date: "2024-05-12T15:11:19-03:00"
 project_files:
     - web-build/Dockerfile.pimp-my-shell
     - homeadditions/.bashrc.d/pimp-my-shell.sh

diff --git a/.ddev/config.pimp-my-shell.yaml b/.ddev/config.pimp-my-shell.yaml
@@ -13,7 +13,6 @@ webimage_extra_packages:
   - dialog
   - figlet
   - htop
-  - kitty-terminfo
   - libarchive-tools
   - lolcat
   - lua5.4

diff --git a/.ddev/web-build/Dockerfile.pimp-my-shell b/.ddev/web-build/Dockerfile.pimp-my-shell
@@ -28,8 +28,19 @@ RUN fish -c "curl -sL 'https://raw.githubusercontent.com/jorgebucaran/fisher/mai
 RUN \
     fish -c "fisher install IlanCosman/[email protected]" ; \
     fish -c "fisher install edc/[email protected]"
-
 USER root:root
 
+# kitty-terminfo from unstable
+RUN set -eux; \
+    pkg_url=$(curl -s https://packages.debian.org/unstable/all/kitty-terminfo/download | grep -oP 'http://http.us.debian.org/debian/pool/main/.*?\.deb'); \
+    mkdir -p /tmp/kitty-terminfo ; \
+    cd /tmp/kitty-terminfo ; \
+    wget -q "$pkg_url" -O kitty-terminfo.deb ; \
+    ar x kitty-terminfo.deb; \
+    tar -xf data.tar.xz; \
+    cp -R usr/share/terminfo/* /usr/share/terminfo; \
+    cd; \
+    rm -fr /tmp/kitty-terminfo;
+
 # vim
 RUN update-alternatives --set editor /usr/bin/vim.nox
diff --git a/config.pimp-my-shell.yaml b/config.pimp-my-shell.yaml
@@ -13,7 +13,6 @@ webimage_extra_packages:
   - dialog
   - figlet
   - htop
-  - kitty-terminfo
   - libarchive-tools
   - lolcat
   - lua5.4

diff --git a/web-build/Dockerfile.pimp-my-shell b/web-build/Dockerfile.pimp-my-shell
@@ -28,8 +28,19 @@ RUN fish -c "curl -sL 'https://raw.githubusercontent.com/jorgebucaran/fisher/mai
 RUN \
     fish -c "fisher install IlanCosman/[email protected]" ; \
     fish -c "fisher install edc/[email protected]"
-
 USER root:root
 
+# kitty-terminfo from unstable
+RUN set -eux; \
+    pkg_url=$(curl -s https://packages.debian.org/unstable/all/kitty-terminfo/download | grep -oP 'http://http.us.debian.org/debian/pool/main/.*?\.deb'); \
+    mkdir -p /tmp/kitty-terminfo ; \
+    cd /tmp/kitty-terminfo ; \
+    wget -q "$pkg_url" -O kitty-terminfo.deb ; \
+    ar x kitty-terminfo.deb; \
+    tar -xf data.tar.xz; \
+    cp -R usr/share/terminfo/* /usr/share/terminfo; \
+    cd; \
+    rm -fr /tmp/kitty-terminfo;
+
 # vim
 RUN update-alternatives --set editor /usr/bin/vim.nox
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,6 @@ webimage_extra_packages: @@
       - dialog
       - figlet
       - htop
-      - kitty-terminfo
       - libarchive-tools
       - lolcat
       - lua5.4
@@ Expand Down @@