Merge branch 'master' of https://github.com/moecube/srvpro

ygopro-server.coffee

@@ -64,6 +64,7 @@ try
     olddialogues.dialogues = oldconfig.dialogues
     fs.writeFileSync(olddialogues.file, JSON.stringify(olddialogues, null, 2))
     delete oldconfig.dialogues
+  if oldconfig.modules
     if oldconfig.modules.tournament_mode and oldconfig.modules.tournament_mode.duel_log
       oldduellog = {}
       oldduellog.file = './config/duel_log.json'
@@ -71,6 +72,7 @@ try
       fs.writeFileSync(oldduellog.file, JSON.stringify(oldduellog, null, 2))
       delete oldconfig.oldduellog
   oldbadwords={}
+  if oldconfig.ban
     if oldconfig.ban.badword_level0
       oldbadwords.level0 = oldconfig.ban.badword_level0
     if oldconfig.ban.badword_level1

ygopro-server.js

@@ -92,6 +92,7 @@
       fs.writeFileSync(olddialogues.file, JSON.stringify(olddialogues, null, 2));
       delete oldconfig.dialogues;
     }
+    if (oldconfig.modules) {
       if (oldconfig.modules.tournament_mode && oldconfig.modules.tournament_mode.duel_log) {
         oldduellog = {};
         oldduellog.file = './config/duel_log.json';
@@ -99,7 +100,9 @@
         fs.writeFileSync(oldduellog.file, JSON.stringify(oldduellog, null, 2));
         delete oldconfig.oldduellog;
       }
+    }
     oldbadwords = {};
+    if (oldconfig.ban) {
       if (oldconfig.ban.badword_level0) {
         oldbadwords.level0 = oldconfig.ban.badword_level0;
       }
@@ -112,6 +115,7 @@
       if (oldconfig.ban.badword_level3) {
         oldbadwords.level3 = oldconfig.ban.badword_level3;
       }
+    }
     if (!_.isEmpty(oldbadwords)) {
       oldbadwords.file = './config/badwords.json';
       fs.writeFileSync(oldbadwords.file, JSON.stringify(oldbadwords, null, 2));

ygopro-update.js

@@ -101,7 +101,7 @@ var makeChangelogs = function(dir, since) {
             var log = logs[i].split(",");
             var date = log[1];
             if (date) {
-                var prc_git_diff = spawnSync("git", [ "diff-tree", "--no-commit-id", "--name-only" ,"--diff-filter=ad" , "-r", log[0] ], { "cwd" : dir });
+                var prc_git_diff = spawnSync("git", [ "diff-tree", "--no-commit-id", "--name-only" ,"--diff-filter=CMR" , "-r", log[0] ], { "cwd" : dir });
                 if (prc_git_diff.stdout) {
                     var lines = prc_git_diff.stdout.toString().split(/\n/g);
                     for (var j in lines) {