docs to arch

Author: ianepreston

src/docs/.devcontainer/Dockerfile

@@ -7,7 +7,7 @@ RUN pacman -Syu --noconfirm && \
 	texlive \
 	python-pipx
 
-RUN pipx install nbdev
 
 USER arch
+RUN pipx install nbdev
 RUN echo y | LANG=C yay -S --provides=false --answerdiff None --answerclean None --mflags "--noconfirm" quarto-cli-bin

src/docs/test-project/test-utils.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 SCRIPT_FOLDER="$(cd "$(dirname $0)" && pwd)"
-USERNAME=${1:-vscode}
+USERNAME=${1:-arch}
 
 if [ -z $HOME ]; then
     HOME="/root"
@@ -51,7 +51,7 @@ checkOSPackages() {
     LABEL=$1
     shift
     echo -e "\n🧪 Testing $LABEL"
-    if dpkg-query --show -f='${Package}: ${Version}\n' "$@"; then 
+    if pacman -Qq "$@"; then 
         echo "✅  Passed!"
         return 0
     else
@@ -61,58 +61,25 @@ checkOSPackages() {
     fi
 }
 
-checkExtension() {
-    # Happens asynchronusly, so keep retrying 10 times with an increasing delay
-    EXTN_ID="$1"
-    TIMEOUT_SECONDS="${2:-10}"
-    RETRY_COUNT=0
-    echo -e -n "\n🧪 Looking for extension $1 for maximum of ${TIMEOUT_SECONDS}s"
-    until [ "${RETRY_COUNT}" -eq "${TIMEOUT_SECONDS}" ] || \
-        [ ! -e $HOME/.vscode-server/extensions/${EXTN_ID}* ] || \
-        [ ! -e $HOME/.vscode-server-insiders/extensions/${EXTN_ID}* ] || \
-        [ ! -e $HOME/.vscode-test-server/extensions/${EXTN_ID}* ] || \
-        [ ! -e $HOME/.vscode-remote/extensions/${EXTN_ID}* ]
-    do
-        sleep 1s
-        (( RETRY_COUNT++ ))
-        echo -n "."
-    done
-
-    if [ ${RETRY_COUNT} -lt ${TIMEOUT_SECONDS} ]; then
-        echo -e "\n✅ Passed!"
-        return 0
-    else
-        echoStderr -e "\n❌ Extension $EXTN_ID not found."
-        FAILED+=("$LABEL")
-        return 1
-    fi
-}
 
 checkCommon()
 {
-    PACKAGE_LIST="apt-utils \
+    PACKAGE_LIST="\
         git \
-        openssh-client \
+        openssh \
         less \
         iproute2 \
         procps \
+        neofetch \
+        ripgrep \
+        fd \
+        lazygit \
         curl \
         wget \
         unzip \
-        nano \
         jq \
-        lsb-release \
-        ca-certificates \
-        apt-transport-https \
-        dialog \
-        gnupg2 \
-        libc6 \
-        libgcc1 \
-        libgssapi-krb5-2 \
-        liblttng-ust1 \
-        libstdc++6 \
-        zlib1g \
-        locales \
+        texlive-xetex \
+        quarto-cli-bin \
         sudo"
 
     # Actual tests
@@ -121,12 +88,6 @@ checkCommon()
     check "locale" [ $(locale -a | grep en_US.utf8) ]
     check "sudo" sudo echo "sudo works."
     check "login-shell-path" [ -f "/etc/profile.d/00-restore-env.sh" ]
-    check "code" which code
-    check "rcm" which lsrc
-    check "xelatex" xelatex --version
-    check "quarto" quarto --version
-    check "nbdev" nbdev_help
-    check "pre-commit" pre-commit -V
 }
 
 reportResults() {
@@ -148,4 +109,4 @@ fixTestProjectFolderPrivs() {
             sudo chown -R ${USERNAME} "${TEST_PROJECT_FOLDER}"
         fi
     fi
-}
+}

src/docs/test-project/test.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 cd $(dirname "$0")
 
-source test-utils.sh vscode
+source test-utils.sh arch
 
 # Run common tests
 checkCommon