Update the ubuntu bootstrap process

test/docker/Dockerfile.ubuntu-noninteractive

@@ -31,19 +31,18 @@ WORKDIR /home/testuser
 COPY --chown=testuser:testuser . /home/testuser/linux-bootstrap
 
 # Create a non-interactive test runner
-RUN cat <<'EOF' > /home/testuser/run-tests.sh && chmod +x /home/testuser/run-tests.sh
-#!/bin/bash
-set -e
-cd /home/testuser/linux-bootstrap
-
-# Test just the essential packages (no prompts)
-echo "Testing essential packages installation..."
-bash ubuntu/install-essential-packages
-
-echo ""
-echo "================================="
-echo "Essential packages test completed"
-echo "================================="
-EOF
+RUN echo '#!/bin/bash' > /home/testuser/run-tests.sh && \
+    echo 'set -e' >> /home/testuser/run-tests.sh && \
+    echo 'cd /home/testuser/linux-bootstrap' >> /home/testuser/run-tests.sh && \
+    echo '' >> /home/testuser/run-tests.sh && \
+    echo '# Test just the essential packages (no prompts)' >> /home/testuser/run-tests.sh && \
+    echo 'echo "Testing essential packages installation..."' >> /home/testuser/run-tests.sh && \
+    echo 'bash ubuntu/install-essential-packages' >> /home/testuser/run-tests.sh && \
+    echo '' >> /home/testuser/run-tests.sh && \
+    echo 'echo ""' >> /home/testuser/run-tests.sh && \
+    echo 'echo "================================="' >> /home/testuser/run-tests.sh && \
+    echo 'echo "Essential packages test completed"' >> /home/testuser/run-tests.sh && \
+    echo 'echo "================================="' >> /home/testuser/run-tests.sh && \
+    chmod +x /home/testuser/run-tests.sh
 
 CMD ["/home/testuser/run-tests.sh"]

ubuntu/bootstrap

@@ -25,9 +25,6 @@ source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/m
 # Starship - https://starship.rs/
 curl -sS https://starship.rs/install.sh | sh
 
-# Zoxide
-curl -sSfL https://raw.githubusercontent.com/ajeetdsouza/zoxide/main/install.sh | sh
-
 # Dev packages
 read -p "Install development tools? " -n 1 -r
 echo

ubuntu/install-essential-packages

@@ -14,6 +14,7 @@ apt-transport-https \
 lsb-release \
 wget \
 apt-transport-https \
+curl \
 bat \
 btop \
 detox \
@@ -35,16 +36,23 @@ tmux \
 ubuntu-restricted-extras \
 yadm \
 zsh \
-zsh-doc
+zsh-doc \
 
-pipx install mnamer
+# Install zoxide/starship only on Ubuntu 25.10+, as they're not available in 24.04 repos
+UBUNTU_VERSION=$(lsb_release -rs 2>/dev/null || echo "24.04")
+if awk -v ver="$UBUNTU_VERSION" 'BEGIN {exit !(ver >= 25.10)}'; then
+	sudo apt-get install -y zoxide starship fastfetch
+fi
 
-# Install deb-get
-# https://github.com/wimpysworld/deb-get
+pipx install mnamer
 
-curl -sL https://raw.githubusercontent.com/wimpysworld/deb-get/main/deb-get | sudo -E bash -s install deb-get
-sudo deb-get update
-sudo deb-get install \
-fastfetch \
-fd \
-mdview
+# Install latest mdview .deb from the GitHub API (amd64)
+MDVIEW_DEB_URL=$(curl -fsSL "https://api.github.com/repos/mapitman/mdview/releases/latest" | grep '"browser_download_url"' | grep 'amd64.*\.deb' | head -1 | cut -d'"' -f4)
+if [ -n "$MDVIEW_DEB_URL" ]; then
+	MDVIEW_TMP_DEB="$(mktemp --suffix=.deb)"
+	wget -q "$MDVIEW_DEB_URL" -O "$MDVIEW_TMP_DEB"
+	sudo apt install -y "$MDVIEW_TMP_DEB"
+	rm -f "$MDVIEW_TMP_DEB"
+else
+	echo "mdview: unable to determine latest .deb URL" >&2
+fi

ubuntu/install-makemkv

@@ -4,7 +4,7 @@
 # Install makemkv
 if ! type makemkv
 then
-    MAKEMKV_VERSION="1.17.6"
+    MAKEMKV_VERSION="1.18.2"
     mkdir -p /tmp/makemkv-build
     pushd /tmp/makemkv-build || exit
 
@@ -29,7 +29,8 @@ then
     qtbase5-dev \
     zlib1g-dev \
     yasm \
-    libfdk-aac-dev
+    libfdk-aac-dev \
+    nasm
 
     pushd /tmp/makemkv-build/ffmpeg || exit
     ./configure --prefix=/tmp/ffmpeg --enable-static --disable-shared --enable-pic --enable-libfdk-aac