Merge pull request #274 from aaronhuggins/master

Update app to latest document server

5 files changed, 26 insertions, 16 deletions

diff --git a/.gitignore b/.gitignore
index 3102d96..2f42eec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 3rdparty/onlyoffice
 build
+oo-extract
+*.rpm
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 5c1b5e3..2343cc3 100644
--- a/Makefile
+++ b/Makefile
@@ -14,18 +14,24 @@ clean:
 
 3rdparty/onlyoffice/documentserver:
 	mkdir -p 3rdparty/onlyoffice
-	docker create --name oo-extract onlyoffice/documentserver:6.4.2.6
-	docker cp oo-extract:/var/www/onlyoffice/documentserver 3rdparty/onlyoffice
-	docker rm oo-extract
-	rm -r 3rdparty/onlyoffice/documentserver/server/{Common,DocService}
-	cd 3rdparty/onlyoffice/documentserver/server/FileConverter/bin && \
-		../../tools/allfontsgen \
-		--input="../../../core-fonts" \
-		--allfonts-web="../../../sdkjs/common/AllFonts.js" \
-		--allfonts="AllFonts.js" \
-		--images="../../../sdkjs/common/Images" \
-		--output-web="../../../fonts" \
-		--selection="font_selection.bin"
+	mkdir -p oo-extract
+	curl -sLO https://github.com/ONLYOFFICE/DocumentServer/releases/download/v7.2.1/onlyoffice-documentserver.x86_64.rpm
+	cd oo-extract && rpm2cpio ../onlyoffice-documentserver.x86_64.rpm | cpio -idm
+	chmod -R 777 oo-extract/
+	cp -r oo-extract/var/www/onlyoffice/documentserver 3rdparty/onlyoffice
+	cp oo-extract/usr/lib64/* 3rdparty/onlyoffice/documentserver/server/FileConverter/bin/
+	cp oo-extract/usr/lib64/* 3rdparty/onlyoffice/documentserver/server/tools/
+	rm -rf oo-extract
+	rm -f onlyoffice-documentserver.x86_64.rpm
+	rm -rf 3rdparty/onlyoffice/documentserver/server/{Common,DocService}
+	cd 3rdparty/onlyoffice/documentserver/server/tools && \
+		./allfontsgen \
+		--input="../../core-fonts" \
+		--allfonts-web="../../sdkjs/common/AllFonts.js" \
+		--allfonts="../FileConverter/bin/AllFonts.js" \
+		--images="../../sdkjs/common/Images" \
+		--output-web="../../fonts" \
+		--selection="../FileConverter/bin/font_selection.bin"
 	sed -i 's/if(yb===d\[a\].ka)/if(d[a]\&\&yb===d[a].ka)/' 3rdparty/onlyoffice/documentserver/sdkjs/*/sdk-all.js
 
 version:
diff --git a/README.md b/README.md
index 9422e5e..53eaeec 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,8 @@ We'd like to also support ARM devices like the Raspberry Pi in the future.
 The community documentserver will automatically configure itself if no other document server is configured in the onlyoffice settings ("Document Editing Service address" is empty).
 All other "Server settings" should be left empty.
 
+If autoconfiguration fails for any reason, you may manually enter the url. Log in as the admin and go to Settings > ONLYOFFICE. For the ONLYOFFICE Docs address, enter the value in the format of `https://<nextcloud_server>/apps/documentserver_community/`.
+
 ## Adding fonts
 
 You can add custom fonts to the document server using the following occ commands
@@ -42,7 +44,7 @@ Specific commands and paths will differ based on your specific setup.
 
 ## Setup from git
 
-When installing from git `make` and `docker` are required.
+When installing from git `make`, `curl`, `rpm2cpio`, and `cpio` are required.
 
 - clone the repo into the Nextcloud app directory 
 - run `make` in the app folder to download the 3rdparty components
diff --git a/appinfo/info.xml b/appinfo/info.xml
index c868a22..f75b9c0 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -14,7 +14,7 @@ The community document server will automatically be configured if no other docum
 
 Additionally, the community document server only supports running on x86-64 Linux servers.]]>
 	</description>
-	<version>0.1.12</version>
+	<version>0.1.13</version>
 	<licence>agpl</licence>
 	<author>Robin Appelman</author>
 	<namespace>DocumentServer</namespace>
@@ -31,7 +31,7 @@ Additionally, the community document server only supports running on x86-64 Linu
 	<screenshot>https://raw.githubusercontent.com/nextcloud/documentserver_community/master/screenshots/main.png</screenshot>
 	<screenshot>https://raw.githubusercontent.com/nextcloud/documentserver_community/master/screenshots/new.png</screenshot>
 	<dependencies>
-		<nextcloud min-version="21" max-version="23"/>
+		<nextcloud min-version="21" max-version="25"/>
 	</dependencies>
 
 	<background-jobs>
diff --git a/lib/OnlyOffice/WebVersion.php b/lib/OnlyOffice/WebVersion.php
index b2aacc2..594dfd8 100644
--- a/lib/OnlyOffice/WebVersion.php
+++ b/lib/OnlyOffice/WebVersion.php
@@ -25,6 +25,6 @@ namespace OCA\DocumentServer\OnlyOffice;
 
 class WebVersion {
 	public function getWebUIVersion(): string {
-		return '6.4.2';
+		return '7.2.1';
 	}
 }