mirror/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2026-04-30 01:09:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse Source 
# Conflicts:
#	Dockerfile
#	package-lock.json
#	package.json
#	src/services/cloning.js
This commit is contained in:
zadam
2022-03-22 21:04:30 +01:00
parent eba824a5b1 2f57d55bea
commit 17dd6141fb
13 changed files with 58 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/copy-trilium.sh
+3
View File
@@ -47,8 +47,11 @@ find $DIR/node_modules -name demo -exec rm -rf {} \;
find $DIR/libraries -name "*.map" -type f -delete
cp $DIR/src/public/app/share.js $DIR/src/public/app-dist/
rm -rf $DIR/src/public/app
sed -i -e 's/app\/desktop.js/app-dist\/desktop.js/g' $DIR/src/views/desktop.ejs
sed -i -e 's/app\/mobile.js/app-dist\/mobile.js/g' $DIR/src/views/mobile.ejs
sed -i -e 's/app\/setup.js/app-dist\/setup.js/g' $DIR/src/views/setup.ejs
sed -i -e 's/app\/share.js/app-dist\/share.js/g' $DIR/src/views/share/*.ejs