vmario/dubdiff
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/adamarthurryan/dubdiff

Browse Source
This commit is contained in:
Adam Brown 2015-06-03 16:10:39 -04:00
commit 26f3a4d97f
5 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
docker/default-packages.sh Normal file → Executable file
View File

0
docker/launch-devel.sh Normal file → Executable file
View File

2
docker/launch-production.sh Normal file → Executable file
View File

@ -18,4 +18,4 @@ fi
echo Run this script from the project root folder! echo Run this script from the project root folder!
docker run -it --rm -e "PORT=8080" --volumes-from=data-docker-home -v ${PWD}:/working -w /working -p 80:8080 adamarthurryan/mean grunt serve:dist docker run --restart=always -it -e "PORT=8080" --volumes-from=data-docker-home -v ${PWD}:/working -w /working -p 8081:8080 adamarthurryan/mean grunt serve:dist

0
docker/prepare.sh Normal file → Executable file
View File

2
server/components/wdiff/index.js
View File

@ -43,7 +43,7 @@ module.exports = function(a, b, asMarkdown, callback) {
if (err) if (err)
return callback(err); return callback(err);
var cmd = "wdiff " + filea.path + " " +fileb.path; var cmd = "./bin/wdiff " + filea.path + " " +fileb.path;
exec(cmd, function(err, stdout) { exec(cmd, function(err, stdout) {
if (err && err.code!=1 && err.code!=0) { if (err && err.code!=1 && err.code!=0) {