Moving bat-extras from dockerfile into the v3 mod

Author: somewatson

Dockerfile

@@ -1,28 +1,8 @@
 # syntax=docker/dockerfile:1
 
-## Buildstage ##
-FROM ghcr.io/linuxserver/baseimage-alpine:3.20 AS buildstage
-
-RUN \
-  apk add --no-cache \
-    bat \
-    git \
-    ripgrep
-
-# Install bat-extras
-RUN git clone https://github.com/eth-p/bat-extras.git /root-layer/bat-extras
-WORKDIR /root-layer/bat-extras/src
-RUN chmod +x *.sh
-RUN mkdir -p /root-layer/bin
-RUN ln -s *.sh /root-layer/bin/
-
-# copy local files
-COPY root/ /root-layer/
-
-## Single layer deployed image ##
 FROM scratch
 
-LABEL maintainer="somewatson"
+LABEL maintainer="username"
 
-# Add files from buildstage
-COPY --from=buildstage /root-layer/ /
+# copy local files
+COPY root/ /

root/etc/s6-overlay/s6-rc.d/init-mod-code-server-bat-add-package/run

@@ -17,4 +17,11 @@ if ! dpkg -s bat >/dev/null 2>&1; then
     echo "bat" >> /mod-repo-packages-to-install.list
 else
     echo "**** bat already installed, skipping ****"
+fi
+
+if ! dpkg -s git >/dev/null 2>&1; then
+    echo "**** Adding git to package install list ****"
+    echo "git" >> /mod-repo-packages-to-install.list
+else
+    echo "**** git already installed, skipping ****"
 fi

root/etc/s6-overlay/s6-rc.d/init-mod-code-server-bat-install/run

@@ -10,10 +10,10 @@ if ! command -v zsh >/dev/null 2>&1; then
 else
     if [ -f ~/.zshrc ]; then
         if ! grep -q 'alias bat="batcat"' ~/.zshrc; then
-            echo 'Adding alias for bat'
+            echo 'Adding alias to zsh for bat'
             echo 'alias bat="batcat"' >> ~/.zshrc
         else
-            echo 'Alias already exists, skipping'
+            echo 'Alias already exists in zsh, skipping'
         fi
     else
         echo '~/.zshrc not found, creating one with the alias'
@@ -26,20 +26,35 @@ if ! command -v bash >/dev/null 2>&1; then
 else
     if [ -f ~/.bash_profile ]; then
         if ! grep -q 'alias bat="batcat"' ~/.bash_profile; then
-            echo 'Adding alias for bat'
+            echo 'Adding alias to ~/.bash_profile for bat'
             echo 'alias bat="batcat"' >> ~/.bash_profile
         else
-            echo 'Alias already exists, skipping'
+            echo 'Alias already exists in ~/.bash_profile, skipping'
         fi
     elif [ -f ~/.bashrc ]; then
         if ! grep -q 'alias bat="batcat"' ~/.bashrc; then
-            echo 'Adding alias for bat'
+            echo 'Adding alias to ~/.bashrc for bat'
             echo 'alias bat="batcat"' >> ~/.bashrc
         else
-            echo 'Alias already exists, skipping'
+            echo 'Alias already exists in ~/.bashrc, skipping'
         fi
     else
         echo '~/.bash_profile or ~/.bashrc not found, creating one with the alias'
         echo 'alias bat="batcat"' > ~/.bash_profile
     fi
-fi
+fi
+
+
+if [ -f ~/bat-extras/README.md ]; then
+    echo 'Installing bat-extras'
+    git clone https://github.com/eth-p/bat-extras.git ~/
+    cd ~/bat-extras/src
+    chmod +x ~/bat-extras/src/*.sh
+    mkdir -p ~/bin
+    ln -s ~/bat-extras/src/*.sh ~/bin
+else
+    echo 'Bat-extras already installed, skipping'
+fi
+
+
+