Fixed synchronization issue

CliClient/install.sh

@@ -3,8 +3,5 @@
 CLIENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 "$CLIENT_DIR/publish.sh"
-npm update -g joplin
-
-# npm version patch
-# $CLIENT_DIR/build.sh
-# sudo rsync -aP "$CLIENT_DIR/build/" "/usr/lib/node_modules/joplin/"
+cd ~/bin/yarn/
+yarn upgrade joplin

CliClient/package.json

@@ -1,16 +1,30 @@
 {
   "name": "joplin",
-  "description": "CLI client for Joplin",
+  "description": "Joplin CLI Client",
   "license": "MIT",
+  "author": "Laurent Cozic",
+  "bugs": {
+   "url": "https://github.com/laurent22/joplin/issues"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/laurent22/joplin"
   },
-  "url": "git://github.com/laurent22/joplin.git",
-  "version": "0.10.43",
+  "copyright": {
+    "title": "Joplin CLI",
+    "years": [
+      2016,
+      2017
+    ],
+    "owner": "Laurent Cozic"
+  },
+  "version": "0.10.44",
   "bin": {
     "joplin": "./main.js"
   },
+  "engines": {
+    "node": ">=8.7.0"
+  },
   "dependencies": {
     "app-module-path": "^2.2.0",
     "babel-plugin-transform-runtime": "^6.23.0",

CliClient/tests/synchronizer.js

@@ -321,7 +321,7 @@ describe('Synchronizer', function() {
 
 		let note = await Note.save({ title: "note1", parent_id: folder1.id });
 		await synchronizer().start();
-		let items = await allItems();
+		let items = await allItems();		
 		expect(items.length).toBe(1);
 		expect(items[0].title).toBe('note1');
 		expect(items[0].is_conflict).toBe(1);

CliClient/tests/test-utils.js

@@ -106,6 +106,7 @@ function setupDatabase(id = null) {
 		// Don't care if the file doesn't exist
 	}).then(() => {
 		databases_[id] = new JoplinDatabase(new DatabaseDriverNode());
+		// databases_[id].setLogger(logger);
 		return databases_[id].open({ name: filePath }).then(() => {
 			BaseModel.db_ = databases_[id];
 			return setupDatabase(id);

ReactNativeClient/lib/models/folder.js

@@ -77,12 +77,6 @@ class Folder extends BaseItem {
 		});
 	}
 
-	static batchDelete(ids, options = null) {
-		for (let i = 0; i < ids.length; i++) {
-			this.delete(ids[i], options);
-		}
-	}
-
 	static conflictFolderTitle() {
 		return _('Conflicts');
 	}