From 21a7be917ef89ab93071264a1b9e646afb9f5e58 Mon Sep 17 00:00:00 2001 From: Ariel Barreiro Date: Sun, 12 May 2024 15:11:16 -0300 Subject: [PATCH] feat: use kitty-terminfo from unstable --- .ddev/addon-metadata/pimp-my-shell/manifest.yaml | 2 +- .ddev/config.pimp-my-shell.yaml | 1 - .ddev/web-build/Dockerfile.pimp-my-shell | 13 ++++++++++++- config.pimp-my-shell.yaml | 1 - web-build/Dockerfile.pimp-my-shell | 13 ++++++++++++- 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.ddev/addon-metadata/pimp-my-shell/manifest.yaml b/.ddev/addon-metadata/pimp-my-shell/manifest.yaml index c3e797f..33aa1c5 100644 --- 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 index 873a095..84e549f 100644 --- 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 index 70a66f9..a7cfe35 100644 --- 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/tide@v6.1.1" ; \ fish -c "fisher install edc/bass@v1.0" - 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 index 873a095..84e549f 100644 --- 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 index 70a66f9..a7cfe35 100644 --- 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/tide@v6.1.1" ; \ fish -c "fisher install edc/bass@v1.0" - 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