diff --git a/bin/copy-trilium.sh b/bin/copy-trilium.sh index c9439f79b..20797edfa 100755 --- a/bin/copy-trilium.sh +++ b/bin/copy-trilium.sh @@ -44,7 +44,7 @@ find $DIR/node_modules -name demo -exec rm -rf {} \; find $DIR/libraries -name "*.map" -type f -delete -rm -r $DIR/src/public/app +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 diff --git a/src/services/sync.js b/src/services/sync.js index 210b3aa9f..d764d1ba8 100644 --- a/src/services/sync.js +++ b/src/services/sync.js @@ -149,8 +149,8 @@ async function pullChanges(syncContext) { sql.transactional(() => { for (const {entityChange, entity} of entityChanges) { - const changeAppliedAlready = !entityChange.changeId - || !!sql.getValue("SELECT id FROM entity_changes WHERE changeId = ?", [entityChange.changeId]); + const changeAppliedAlready = entityChange.changeId + && !!sql.getValue("SELECT id FROM entity_changes WHERE changeId = ?", [entityChange.changeId]); if (!changeAppliedAlready && !sourceIdService.isLocalSourceId(entityChange.sourceId)) { if (!atLeastOnePullApplied) { // send only for first