From b5ec49dda10564f955ad95e93fc34ef346c85208 Mon Sep 17 00:00:00 2001 From: Kostas Lekkas Date: Fri, 22 Apr 2016 13:41:54 +0300 Subject: [PATCH 1/2] Remove resin sync 'exec after rsync' feature as it's not supported by ssh gateway --- build/actions/sync.js | 7 +------ doc/cli.markdown | 5 ----- lib/actions/sync.coffee | 6 ------ 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/build/actions/sync.js b/build/actions/sync.js index 41350628..5457f3e0 100644 --- a/build/actions/sync.js +++ b/build/actions/sync.js @@ -19,7 +19,7 @@ limitations under the License. module.exports = { signature: 'sync ', description: '(beta) sync your changes with a device', - help: 'Use this command to sync your local changes to a certain device on the fly.\n\nYou can save all the options mentioned below in a `resin-sync.yml` file,\nby using the same option names as keys. For example:\n\n $ cat $PWD/resin-sync.yml\n source: src/\n before: \'echo Hello\'\n exec: \'python main.py\'\n ignore:\n - .git\n - node_modules/\n progress: true\n\nNotice that explicitly passed command options override the ones set in the configuration file.\n\nExamples:\n\n $ resin sync 7cf02a6\n $ resin sync 7cf02a6 --port 8080\n $ resin sync 7cf02a6 --ignore foo,bar', + help: 'Use this command to sync your local changes to a certain device on the fly.\n\nYou can save all the options mentioned below in a `resin-sync.yml` file,\nby using the same option names as keys. For example:\n\n $ cat $PWD/resin-sync.yml\n source: src/\n before: \'echo Hello\'\n ignore:\n - .git\n - node_modules/\n progress: true\n\nNotice that explicitly passed command options override the ones set in the configuration file.\n\nExamples:\n\n $ resin sync 7cf02a6\n $ resin sync 7cf02a6 --port 8080\n $ resin sync 7cf02a6 --ignore foo,bar', permission: 'user', primary: true, options: [ @@ -38,11 +38,6 @@ limitations under the License. parameter: 'command', description: 'execute a command before syncing', alias: 'b' - }, { - signature: 'exec', - parameter: 'command', - description: 'execute a command after syncing (on the device)', - alias: 'x' }, { signature: 'progress', boolean: true, diff --git a/doc/cli.markdown b/doc/cli.markdown index e51bf6c9..f1a06bd4 100644 --- a/doc/cli.markdown +++ b/doc/cli.markdown @@ -588,7 +588,6 @@ by using the same option names as keys. For example: $ cat $PWD/resin-sync.yml source: src/ before: 'echo Hello' - exec: 'python main.py' ignore: - .git - node_modules/ @@ -616,10 +615,6 @@ comma delimited paths to ignore when syncing execute a command before syncing -#### --exec, -x <command> - -execute a command after syncing (on the device) - #### --progress, -p show progress diff --git a/lib/actions/sync.coffee b/lib/actions/sync.coffee index 033c439e..166def69 100644 --- a/lib/actions/sync.coffee +++ b/lib/actions/sync.coffee @@ -26,7 +26,6 @@ module.exports = $ cat $PWD/resin-sync.yml source: src/ before: 'echo Hello' - exec: 'python main.py' ignore: - .git - node_modules/ @@ -57,11 +56,6 @@ module.exports = parameter: 'command' description: 'execute a command before syncing' alias: 'b' - , - signature: 'exec' - parameter: 'command' - description: 'execute a command after syncing (on the device)' - alias: 'x' , signature: 'progress' boolean: true From 9400d4027af49da7c90f90a8ca2024530111f0ce Mon Sep 17 00:00:00 2001 From: Kostas Lekkas Date: Fri, 22 Apr 2016 21:20:45 +0300 Subject: [PATCH 2/2] Update resin-settings-client version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cba983bf..db4c2b26 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "resin-image-manager": "^4.0.0", "resin-pine": "^1.3.0", "resin-sdk": "^5.2.0", - "resin-settings-client": "^3.1.0", + "resin-settings-client": "^3.5.0", "resin-sync": "^1.0.0", "resin-vcs": "^2.0.0", "rimraf": "^2.4.3",