Merge pull request #41 from ublue-os/m2Giles-patch-1

chore: don't hardcode line numbers
ublue-os · Feb 2, 2024 · 7ab6b72 · 7ab6b72
2 parents 2cee5ac + 0c11218
commit 7ab6b72
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/toolboxes/bluefin-cli/Containerfile.bluefin-cli b/toolboxes/bluefin-cli/Containerfile.bluefin-cli
@@ -20,9 +20,9 @@ RUN apk update && \
     rm /toolbox-packages
 
 # Patch /usr/bin/entrypoint
-RUN sed -i '349,489 s/^/#/' /usr/bin/entrypoint && \
-    sed -i '499,1355 s/^/#/' /usr/bin/entrypoint && \
-    sed -i '1357 s/^/#/' /usr/bin/entrypoint
+RUN sed -i '/missing_packages=0/,/# Workaround for when sudo is missing,/ s/^/#/' /usr/bin/entrypoint && \
+    sed -i '/elif command -v apt-get/,/# Set SHELL to the install path inside the container/ s/^/#/' /usr/bin/entrypoint && \
+    sed -i '/# Set SHELL to the install path inside the container/a touch /.containersetupdone' /usr/bin/entrypoint
 
 # Use and configure bash, retrieve bash-prexec
 RUN curl https://raw.githubusercontent.com/rcaloras/bash-preexec/master/bash-preexec.sh -o /tmp/bash-prexec && \