Update Dockerfile

Dockerfile

@@ -39,7 +39,7 @@ ENV HOME=/root \
     PIP_NO_CACHE_DIR=1 \
     HOSTNAME=kanha
 
-# ── Install shellular globally into /usr/local (never persisted, always works) ─
+# ── Install shellular globally ────────────────────────────────────────────────
 RUN npm install -g --prefix /usr/local shellular
 
 # ── Create Python venv ────────────────────────────────────────────────────────
@@ -51,31 +51,57 @@ RUN python3 -m venv /root/venv && \
 # ── Shell config ──────────────────────────────────────────────────────────────
 RUN echo 'export PS1="\u@kanha:\w\$ "' >> /root/.bashrc && \
     echo 'cd /data' >> /root/.bashrc && \
-    echo '. /root/venv/bin/activate' >> /root/.bashrc && \
-    echo 'cd /data' >> /root/.bash_profile && \
-    echo '. /root/venv/bin/activate' >> /root/.bash_profile
+    echo 'cd /data' >> /root/.bash_profile
 
-# ── apt-install wrapper ───────────────────────────────────────────────────────
+# ── Intercept apt and apt-get → save packages to apt.txt ─────────────────────
+# Moves real binaries to /usr/bin/apt.real and /usr/bin/apt-get.real
+# Our wrappers sit in /usr/local/bin which is higher priority in PATH
 RUN printf '%s\n' \
     '#!/bin/sh' \
-    'set -e' \
+    '# Wrapper for apt and apt-get — intercepts install and saves to apt.txt' \
     'APT_FILE="/data/apt.txt"' \
-    'touch "$APT_FILE"' \
-    'apt-get update -qq' \
-    'for pkg in "$@"; do' \
-    '    pkg=$(echo "$pkg" | tr -d "[:space:]")' \
-    '    [ -z "$pkg" ] && continue' \
-    '    apt-get install -y --no-install-recommends "$pkg"' \
-    '    if ! grep -qx "$pkg" "$APT_FILE"; then' \
-    '        echo "$pkg" >> "$APT_FILE"' \
-    '        echo "✓ $pkg saved to apt.txt"' \
-    '    else' \
-    '        echo "✓ $pkg installed (already in apt.txt)"' \
+    'REAL_BIN="$1"' \
+    'shift' \
+    'if [ "$1" = "install" ]; then' \
+    '    shift' \
+    '    # Run the real apt/apt-get install' \
+    '    "$REAL_BIN" install "$@"' \
+    '    STATUS=$?' \
+    '    # Only save if install succeeded' \
+    '    if [ $STATUS -eq 0 ]; then' \
+    '        touch "$APT_FILE"' \
+    '        for arg in "$@"; do' \
+    '            # Skip flags like -y --no-install-recommends' \
+    '            case "$arg" in' \
+    '                -*) continue ;;' \
+    '            esac' \
+    '            # Skip if already in apt.txt' \
+    '            if ! grep -qx "$arg" "$APT_FILE"; then' \
+    '                echo "$arg" >> "$APT_FILE"' \
+    '                echo "✓ $arg saved to apt.txt"' \
+    '            fi' \
+    '        done' \
     '    fi' \
-    'done' \
-    'rm -rf /var/lib/apt/lists/*' \
-    > /usr/local/bin/apt-install && \
-    chmod +x /usr/local/bin/apt-install
+    '    exit $STATUS' \
+    'fi' \
+    '# For all other apt commands (update, remove, etc) just pass through' \
+    '"$REAL_BIN" "$@"' \
+    > /usr/local/bin/_apt_wrapper && \
+    chmod +x /usr/local/bin/_apt_wrapper
+
+# apt wrapper
+RUN printf '%s\n' \
+    '#!/bin/sh' \
+    'exec /usr/local/bin/_apt_wrapper /usr/bin/apt "$@"' \
+    > /usr/local/bin/apt && \
+    chmod +x /usr/local/bin/apt
+
+# apt-get wrapper
+RUN printf '%s\n' \
+    '#!/bin/sh' \
+    'exec /usr/local/bin/_apt_wrapper /usr/bin/apt-get "$@"' \
+    > /usr/local/bin/apt-get && \
+    chmod +x /usr/local/bin/apt-get
 
 # ── Ensure /data exists ───────────────────────────────────────────────────────
 RUN mkdir -p /data
@@ -112,21 +138,30 @@ RUN printf '%s\n' \
     '' \
     'rm -f /data/persist/venv/lib/python*/EXTERNALLY-MANAGED' \
     '' \
+    '# Write real venv path to every shell automatically' \
+    'cat > /etc/profile.d/venv.sh << EOF' \
     'export VIRTUAL_ENV=/data/persist/venv' \
     'export PATH="/data/persist/venv/bin:$PATH"' \
+    'EOF' \
     '' \
-    '# ── apt.txt auto-install on every restart ────────────────────────────' \
+    'grep -qx "source /etc/profile.d/venv.sh" /root/.bashrc || echo "source /etc/profile.d/venv.sh" >> /root/.bashrc' \
+    '' \
+    'export VIRTUAL_ENV=/data/persist/venv' \
+    'export PATH="/data/persist/venv/bin:$PATH"' \
+    '' \
+    '# ── apt.txt: reinstall saved packages on every restart ───────────────' \
     'APT_FILE="/data/apt.txt"' \
-    'if [ ! -f "$APT_FILE" ]; then' \
-    '    touch "$APT_FILE"' \
-    'fi' \
+    'if [ ! -f "$APT_FILE" ]; then touch "$APT_FILE"; fi' \
     'if [ -s "$APT_FILE" ]; then' \
-    '    apt-get update -qq' \
+    '    echo "▶ Installing packages from apt.txt..."' \
+    '    /usr/bin/apt-get update -qq' \
     '    while IFS= read -r pkg || [ -n "$pkg" ]; do' \
     '        pkg=$(echo "$pkg" | tr -d "[:space:]")' \
     '        [ -z "$pkg" ] && continue' \
     '        [ "${pkg#\#}" != "$pkg" ] && continue' \
-    '        apt-get install -y --no-install-recommends "$pkg" || echo "WARNING: Failed to install $pkg"' \
+    '        /usr/bin/apt-get install -y --no-install-recommends "$pkg" \' \
+    '            && echo "✓ $pkg" \' \
+    '            || echo "WARNING: Failed to install $pkg"' \
     '    done < "$APT_FILE"' \
     '    rm -rf /var/lib/apt/lists/*' \
     'fi' \