Align the latex and pandoc installing scripts

the PR being merged split the install_pdf_deps.sh into two scripts, install_texlive.sh and install_pandoc.sh

this will need to be revisited later and consolidated

Author: jiridanek

jupyter/utils/install_pandoc.sh

@@ -9,6 +9,16 @@ UNAME_TO_GOARCH["ppc64le"]="ppc64le"
 UNAME_TO_GOARCH["s390x"]="s390x"
 
 ARCH="${UNAME_TO_GOARCH[$(uname -m)]}"
+if [[ -z "${ARCH:-}" ]]; then
+    echo "Unsupported architecture: $(uname -m)" >&2
+    exit 1
+fi
+
+# Skip PDF export installation for s390x architecture
+if [[ "$(uname -m)" == "s390x" ]]; then
+    echo "PDF export functionality is not supported on s390x architecture. Skipping installation."
+    exit 0
+fi
 
 if [[ "$ARCH" == "ppc64le" ]]; then
   # Install Pandoc from source
@@ -25,7 +35,13 @@ if [[ "$ARCH" == "ppc64le" ]]; then
   git submodule update --init --recursive
 
   cabal update
+
+  # Build the CLI tool (not the top-level library package)
   cd pandoc-cli
+
+  # Clean previous builds
+  cabal clean
+
   cabal build -j"$(nproc)"
   mkdir -p /usr/local/pandoc/bin
   cabal install \
@@ -38,6 +54,7 @@ if [[ "$ARCH" == "ppc64le" ]]; then
   dnf remove -y cabal-install ghc gmp-devel
   dnf clean all && rm -rf /var/cache/dnf
 
+  # Verify installation
   /usr/local/pandoc/bin/pandoc --version
 
 elif [[ "$ARCH" == "amd64" ]]; then

jupyter/utils/install_pdf_deps.sh

@@ -23,8 +23,6 @@ if [[ "$(uname -m)" == "s390x" ]]; then
     exit 0
 fi
 
-ARCH=$(uname -m)
-
 if [[ "$ARCH" == "ppc64le" ]]; then
   echo "Installing TeX Live from source for $ARCH"
 
@@ -65,11 +63,13 @@ if [[ "$ARCH" == "ppc64le" ]]; then
 
   # Set version
   PANDOC_VERSION=3.7.0.2
+
   cd /tmp
   git clone --recurse-submodules https://github.com/jgm/pandoc.git
   cd pandoc
   git checkout ${PANDOC_VERSION}
   git submodule update --init --recursive
+
   cabal update
 
   # Build the CLI tool (not the top-level library package)
@@ -85,20 +85,21 @@ if [[ "$ARCH" == "ppc64le" ]]; then
   rm -rf ~/.cabal ~/.ghc /tmp/pandoc
   dnf remove -y cabal-install ghc gmp-devel
   dnf clean all && rm -rf /var/cache/dnf
+
   # Verify installation
   /usr/local/bin/pandoc --version
 
 fi
 
-if [[ "$ARCH" == "x86_64" ]]; then
+if [[ "$ARCH" == "amd64" ]]; then
   # tex live installation
   echo "Installing TexLive to allow PDf export from Notebooks"
   curl -fL https://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz -o install-tl-unx.tar.gz
   zcat < install-tl-unx.tar.gz | tar xf -
   cd install-tl-2*
   perl ./install-tl --no-interaction --scheme=scheme-small --texdir=/usr/local/texlive
   mv /usr/local/texlive/bin/"$(uname -m)-linux" /usr/local/texlive/bin/linux
-cd /usr/local/texlive/bin/linux
+  cd /usr/local/texlive/bin/linux
   ./tlmgr install tcolorbox pdfcol adjustbox titling enumitem soul ucs collection-fontsrecommended
 
   # pandoc installation
@@ -108,4 +109,3 @@ cd /usr/local/texlive/bin/linux
   rm -f /tmp/pandoc.tar.gz
 
 fi
-

jupyter/utils/install_texlive.sh

@@ -9,6 +9,16 @@ UNAME_TO_GOARCH["ppc64le"]="ppc64le"
 UNAME_TO_GOARCH["s390x"]="s390x"
 
 ARCH="${UNAME_TO_GOARCH[$(uname -m)]}"
+if [[ -z "${ARCH:-}" ]]; then
+    echo "Unsupported architecture: $(uname -m)" >&2
+    exit 1
+fi
+
+# Skip PDF export installation for s390x architecture
+if [[ "$(uname -m)" == "s390x" ]]; then
+    echo "PDF export functionality is not supported on s390x architecture. Skipping installation."
+    exit 0
+fi
 
 if [[ "$ARCH" == "ppc64le" ]]; then
   echo "Installing TeX Live from source for $ARCH..."
@@ -29,13 +39,15 @@ if [[ "$ARCH" == "ppc64le" ]]; then
   # Create build directory and build
   mkdir ../texlive-build
   cd ../texlive-build
+
+  # Configure, build, install
   ../texlive-20250308-source/configure --prefix=/usr/local/texlive
   make -j"$(nproc)"
   make install
 
   # Symlink for pdflatex
   ln -sf pdftex /usr/local/texlive/bin/powerpc64le-unknown-linux-gnu/pdflatex
-  
+
   # Cleanup sources to reduce image size
   rm -rf /texlive-20250308-source /texlive-build
 
@@ -58,12 +70,11 @@ EOF
 
   ./install-tl --profile=texlive.profile --custom-bin=$TEXLIVE_INSTALL_PREFIX/bin/powerpc64le-unknown-linux-gnu
 
-# TeX Live binary directory
-TEX_BIN_DIR="/usr/local/texlive/bin/powerpc64le-unknown-linux-gnu"
-
-# Create standard symlink 'linux' → arch-specific folder
-ln -sf "$TEX_BIN_DIR" /usr/local/texlive/bin/linux
+  # TeX Live binary directory
+  TEX_BIN_DIR="/usr/local/texlive/bin/powerpc64le-unknown-linux-gnu"
 
+  # Create standard symlink 'linux' → arch-specific folder
+  ln -sf "$TEX_BIN_DIR" /usr/local/texlive/bin/linux
 
   # Set up environment
   export PATH="$TEXLIVE_INSTALL_PREFIX/bin/linux:$PATH"
@@ -86,4 +97,3 @@ else
   exit 1
 
 fi
-