Rename install-office.sh

This commit is contained in:
Wolfgang Ginolas 2026-08-26 14:45:10 +02:00
parent 834bdfe335
commit 665c75c04b
6 changed files with 30 additions and 12 deletions

View File

@ -23,3 +23,15 @@ customize
data
datastore
docs
/config.js
customization
*.db
/customize/
customize
logs
privileged.conf
config/config.js
config/sso.js
lib/plugins/*
/onlyoffice-conf/
/onlyoffice-dist/

View File

@ -4,6 +4,12 @@ SPDX-FileCopyrightText: 2023 XWiki CryptPad Team <contact@cryptpad.org> and cont
SPDX-License-Identifier: AGPL-3.0-or-later
-->
# TODO next release
## Upgrade notes
`./install-onlyoffice.sh` is now called `/install-office.sh`. Make sure to use the new name in the future.
# 🌷🩹 Spring fix release (2026.5.1)
This release contains the following fixes:

View File

@ -26,7 +26,7 @@ FROM node:lts-alpine
RUN addgroup -S cryptpad -g 4001 && adduser -S cryptpad -G cryptpad --uid 4001 -h /cryptpad
# Install curl for healthcheck
# Install git, rdfind and unzip for install-onlyoffice.sh
# Install git, rdfind and unzip for install-office.sh
RUN apk add --no-cache ca-certificates git rdfind unzip bash curl
# Copy cryptpad with installed modules

View File

@ -14,8 +14,8 @@ services:
- CPAD_CONF=/cryptpad/config/config.js
# Read and accept the license before uncommenting the following line:
# https://github.com/ONLYOFFICE/web-apps/blob/master/LICENSE.txt
# - CPAD_INSTALL_ONLYOFFICE=yes
# https://github.com/Euro-Office/web-apps/raw/refs/heads/main/LICENSE.txt
# - CPAD_INSTALL_OFFICE=yes
volumes:
- ./data/blob:/cryptpad/blob

View File

@ -30,8 +30,8 @@ fi
cd $CPAD_HOME
if [ "$CPAD_INSTALL_ONLYOFFICE" == "yes" ]; then
./install-onlyoffice.sh --accept-license --trust-repository
if [ "$CPAD_INSTALL_ONLYOFFICE" == "yes" ] || [ "$CPAD_INSTALL_OFFICE" == "yes" ]; then
./install-office.sh --accept-license --trust-repository
fi
npm run build

View File

@ -182,8 +182,8 @@ ask_for_license() {
ensure_command_available curl
(
echo -e "Please review the license of OnlyOffice:\n\n"
curl https://raw.githubusercontent.com/ONLYOFFICE/web-apps/master/LICENSE.txt 2>/dev/null
echo -e "Please review the license of Euro-Office and press 'q' to continue:\n\n"
curl https://raw.githubusercontent.com/Euro-Office/web-apps/refs/heads/main/LICENSE.txt 2>/dev/null
) | less
read -rp "Do you accept the license? (Y/N): " confirm &&
@ -194,16 +194,16 @@ ask_for_license() {
show_help() {
cat <<EOF
install-onlyoffice installs or upgrades OnlyOffice.
install-office installs or upgrades Euro-Office.
OPTIONS:
-h, --help
Show this help.
-a, --accept-license
Accept the license of OnlyOffice and do not ask when running this
Accept the license of Euro-Office and do not ask when running this
script. Read and accept this before using this option:
https://github.com/ONLYOFFICE/web-apps/blob/master/LICENSE.txt
https://github.com/Euro-Office/web-apps/raw/refs/heads/main/LICENSE.txt
-t, --trust-repository
Automatically configure the cloned onlyoffice-builds repository
@ -211,7 +211,7 @@ OPTIONS:
https://git-scm.com/docs/git-config/#Documentation/git-config.txt-safedirectory
--check
Do not install OnlyOffice, only check if the existing installation
Do not install Euro-Office, only check if the existing installation
is up to date. Exits 0 if it is up to date, nonzero otherwise.
--rdfind
@ -230,7 +230,7 @@ ensure_oo_is_downloaded() {
ensure_command_available git
if ! [ -d "$BUILDS_DIR" ]; then
echo "Downloading OnlyOffice..."
echo "Downloading Office..."
git clone --bare https://github.com/cryptpad/onlyoffice-builds.git "$BUILDS_DIR"
fi
if [ ${TRUST_REPOSITORY+x} ] || [ "${PROPS[trust_repository]:-no}" == yes ]; then