Fix #32 Spreadsheet changes not save (#48)

ONLYOFFICE · Jan 19, 2021 · bae94cf · bae94cf
1 parent c0a8511
commit bae94cf
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/snap/hooks/install b/snap/hooks/install
@@ -2,3 +2,18 @@
 
 cp  -R $SNAP/etc $SNAP_DATA/
 mkdir -p $SNAP_DATA/var/www/onlyoffice/Data/certs
+
+TOOLDIR="$SNAP/var/www/onlyoffice/documentserver/server/tools"
+INDIR="$SNAP/var/www/onlyoffice/documentserver"
+OUTDIR="$SNAP_DATA/var/www/onlyoffice/documentserver"
+
+mkdir -p $OUTDIR/server/FileConverter/bin
+mkdir -p $OUTDIR/fonts
+mkdir -p $OUTDIR/sdkjs/common/Images
+
+"$TOOLDIR/allfontsgen" --input="$INDIR/core-fonts;/var/lib/snapd/hostfs/usr/share/fonts"  --allfonts-web="$OUTDIR/sdkjs/common/AllFonts.js"  --allfonts="$OUTDIR/server/FileConverter/bin/AllFonts.js"  --images="$OUTDIR/sdkjs/common/Images"   --selection="$OUTDIR/server/FileConverter/bin/font_selection.bin"  --output-web="$OUTDIR/fonts"  --use-system="true"
+
+mkdir -p $OUTDIR/sdkjs/slide/themes
+cp -R $INDIR/sdkjs/slide/themes_backup/src $OUTDIR/sdkjs/slide/themes
+
+"$TOOLDIR/allthemesgen" --converter-dir="$INDIR/server/FileConverter/bin" --src="$OUTDIR/sdkjs/slide/themes" --output="$OUTDIR/sdkjs/common/Images"
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -93,10 +93,20 @@ parts:
       cp $SNAPCRAFT_PART_INSTALL/var/www/onlyoffice/documentserver/server/FileConverter/bin/libicuuc.so.58 $SNAPCRAFT_PART_INSTALL/lib/
       cp $SNAPCRAFT_PART_INSTALL/var/www/onlyoffice/documentserver/server/FileConverter/bin/libicudata.so.58 $SNAPCRAFT_PART_INSTALL/lib/
       # documentserver-generate-allfonts.sh
-      mkdir -p $SNAPCRAFT_PART_INSTALL/var/www/onlyoffice/documentserver/fonts
       DIR="$SNAPCRAFT_PART_INSTALL/var/www/onlyoffice/documentserver"
-      "$DIR/server/tools/allfontsgen" --input="$DIR/core-fonts"  --allfonts-web="$DIR/sdkjs/common/AllFonts.js"  --allfonts="$DIR/server/FileConverter/bin/AllFonts.js"  --images="$DIR/sdkjs/common/Images"   --selection="$DIR/server/FileConverter/bin/font_selection.bin"  --output-web="$DIR/fonts"  --use-system="false"
-      "$DIR/server/tools/allthemesgen" --converter-dir="$DIR/server/FileConverter/bin" --src="$DIR/sdkjs/slide/themes" --output="$DIR/sdkjs/common/Images"
+      OUTDIR="/var/snap/onlyoffice-ds/current/var/www/onlyoffice/documentserver"
+      #fonts
+      ln -s -f $OUTDIR/server/FileConverter/bin/AllFonts.js $DIR/server/FileConverter/bin/AllFonts.js
+      ln -s -f $OUTDIR/server/FileConverter/bin/font_selection.bin $DIR/server/FileConverter/bin/font_selection.bin
+      ln -s -f $OUTDIR/fonts $DIR/fonts
+      ln -s -f $OUTDIR/sdkjs/common/Images/fonts_thumbnail.png $DIR/sdkjs/common/Images/fonts_thumbnail.png
+      ln -s -f $OUTDIR/sdkjs/common/Images/fonts_thumbnail@2x.png $DIR/sdkjs/common/Images/fonts_thumbnail@2x.png
+      ln -s -f $OUTDIR/sdkjs/common/AllFonts.js $DIR/sdkjs/common/AllFonts.js
+      #themes
+      mv $DIR/sdkjs/slide/themes $DIR/sdkjs/slide/themes_backup
+      ln -s -f $OUTDIR/sdkjs/slide/themes $DIR/sdkjs/slide/themes
+      ln -s -f $OUTDIR/sdkjs/common/Images/themes_thumbnail.png $DIR/sdkjs/common/Images/themes_thumbnail.png
+      ln -s -f $OUTDIR/sdkjs/common/Images/themes_thumbnail@2x.png $DIR/sdkjs/common/Images/themes_thumbnail@2x.png
 
   node:
     plugin: dump