Skip to content

Commit

Permalink
fix: revert to libreoffice7 for amd64
Browse files Browse the repository at this point in the history
  • Loading branch information
MthwRobinson committed Jun 28, 2024
1 parent 6bdfd58 commit 6c8ea9e
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 6 deletions.
1 change: 1 addition & 0 deletions scripts/docker-dl-wolfi-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ else
files=(
"poppler-23.09.0-r0.apk"
"pandoc-3.1.8-r0.apk"
"libreoffice-7.6.5-r0.apk"
"nltk_data.tgz"
)
fi
Expand Down
2 changes: 2 additions & 0 deletions scripts/initialize-libreoffice.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/bash

ARCH=$(uname -m)

/usr/bin/soffice --headless || [ $? -eq 81 ] || exit 1
23 changes: 17 additions & 6 deletions scripts/install-wolfi-libreoffice.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
#!/bin/bash

apk add libreoffice
ln -s /usr/lib/libreoffice/program/soffice.bin /usr/bin/libreoffice
ln -s /usr/lib/libreoffice/program/soffice.bin /usr/bin/soffice
chmod +x /usr/lib/libreoffice/program/soffice.bin
chmod +x /usr/bin/libreoffice
chmod +x /usr/bin/soffice
RCH=$(uname -m)

if [[ "$ARCH" == "x86_64" ]] || [[ "$ARCH" == "amd64" ]]; then
apk add --allow-untrusted packages/libreoffice-7.6.5-r0.apk
ln -s /usr/local/lib/libreoffice/program/soffice.bin /usr/bin/libreoffice
ln -s /usr/local/lib/libreoffice/program/soffice.bin /usr/bin/soffice
chmod +x /usr/local/lib/libreoffice/program/soffice.bin
chmod +x /usr/bin/libreoffice
chmod +x /usr/bin/soffice
else
apk add libreoffice
ln -s /usr/lib/libreoffice/program/soffice.bin /usr/bin/libreoffice
ln -s /usr/lib/libreoffice/program/soffice.bin /usr/bin/soffice
chmod +x /usr/lib/libreoffice/program/soffice.bin
chmod +x /usr/bin/libreoffice
chmod +x /usr/bin/soffice
fi

0 comments on commit 6c8ea9e

Please sign in to comment.