Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	dashboard.tar.gz
	digexp-dashboard/postinstall.js

Author: gsager

README.md

@@ -19,7 +19,9 @@ The Dashboard tool uses the nw.js package to implement the user interface, and o
 # Installation
 You must first install Node.js.  Node.js version 0.12 is the tested and recommended version.
 
-Download the digexp-toolkit.zip file from https://github.com/OpenNTF/WebDevToolkitForDx/blob/master/release/digexp-toolkit.zip and unzip it on your workstation. Then run install.cmd (Windows) or install.sh (Mac/Linux). This will install the two main programs, dxdashboard (for the dashboard UI) and dxwcmdesigns (the command line support for accessing WCM design libraries). That completes the installation.  
+Download the digexp-toolkit.zip file from here: https://github.com/OpenNTF/WebDevToolkitForDx/blob/master/release/digexp-toolkit.zip?raw=true
+
+Extract the file on your workstation. Then run install.cmd (Windows) or install.sh (Mac/Linux). This will install the two main programs, dxdashboard (for the dashboard UI) and dxwcmdesigns (the command line support for accessing WCM design libraries). That completes the installation.  
 
 For the Script Portlet "Push" support, you will need to have the Script Portlet command line client support installed and configured, and you will need to have the "sp" command on your system path. See this documentation for more on installing the Script Portlet command line client: http://www-01.ibm.com/support/knowledgecenter/SSHRKX_8.5.0/script/script-portlet/cmd_line_push.dita
 

digexp-dashboard/package.json

@@ -25,6 +25,7 @@
     "async": "^1.3.0",
     "chokidar": "^1.0.3",
     "diff": "^1.4.0",
+    "dxsync": "https://github.com/digexp/dxsync/archive/1.0.2.tar.gz",
     "digexp-wcm-design": "file:../wcm-design.tar.gz",
     "findit": "",
     "map-stream": "0.0.6",
@@ -37,6 +38,10 @@
     "vinyl": "^0.5.0",
     "vinyl-fs": "^1.0.0"
   },
+  "config": {
+    "unsafe-perm": true,
+    "no-optional": true
+  },
   "scripts": {
     "preinstall": "node preinstall.js",
     "postinstall": "node postinstall.js"

digexp-dashboard/preinstall.js

@@ -12,6 +12,8 @@ var fs = require("fs");
 var ch = require("child_process");
 
 ch.exec("npm root -g", function(err, root) {
+  root = root || process.env._;
+  console.log(root);
   if (root) {
     root = root.replace(/\n|\r/g, "");
     fs.readFile(path.resolve(root, "digexp-dashboard/user-settings.json"),

gulpfile.js

@@ -21,7 +21,7 @@ const SP_SERVER = "./digexp-sp-server";
 var getFileList = function(folder) {
   // todo read gitignore, npmignore
   return [folder + "/**", "!" + folder + "/.git/**", "!" + folder + "/node_modules/**",
-          "!" + folder + "/node_modules/", "!" + folder + "/.idea/**", "!" + folder + "/user-settings.json"];
+          "!" + folder + "/node_modules/", "!" + folder + "/.idea/**", "!" + folder + "/user-settings.json", + "!" + folder + "/**.*~"];
 };
 
 var npm_pack = function(folder, dest) {
@@ -66,4 +66,4 @@ gulp.task("watch_sp-server", function() {
 
 gulp.task("watch", ['watch_wcm', 'watch_sp-server', 'watch_dashboard'])
 
-gulp.task('default', ['pack', 'watch']);
+gulp.task('default', ['pack', 'watch']);

install.cmd

@@ -1,3 +1,3 @@
 call npm install -g wcm-design.tar.gz
-call npm install -g dashboard.tar.gz
+call npm install -g --unsafe-perm --no-optional dashboard.tar.gz 
 call npm install -g nw

install.sh

@@ -1,3 +1,3 @@
 npm install -g wcm-design.tar.gz
-npm install -g dashboard.tar.gz
+npm install -g --unsafe-perm --no-optional dashboard.tar.gz 
 npm install -g nw

package.json

@@ -1,12 +1,12 @@
 {
-  "name": "diggexp-toolkit",
+  "name": "digexp-toolkit",
   "version": "0.1.0",
   "devDependencies": {
     "grunt": "latest",
     "grunt-contrib-compress": "latest",
-	"gulp": "latest",
-	"gulp-tar": "latest",
-	"gulp-gzip": "latest",
-	"map-stream": "latest"
+    "gulp": "^3.9.0",
+    "gulp-gzip": "^1.2.0",
+    "gulp-tar": "^1.4.0",
+    "map-stream": "0.0.6"
   }
 }