cob-cli 2.37.1 → 2.38.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -247,11 +247,11 @@ async function mergeFiles(block) {
|
|
|
247
247
|
let mergeFileContent = fs.readFileSync(mergeFile).toString();
|
|
248
248
|
// With comments we support JS, CSS, GROOVY
|
|
249
249
|
let startStr = "/* COB-CLI START " + blockMark + " */\n";
|
|
250
|
-
let endStr = "\n/* COB-CLI END " + blockMark + "
|
|
250
|
+
let endStr = "\n/* COB-CLI END " + blockMark + " */";
|
|
251
251
|
|
|
252
252
|
if (prodFileContent.indexOf(startStr) < 0) {
|
|
253
253
|
// If previous customization does not exist
|
|
254
|
-
prodFileContent = startStr + mergeFileContent + endStr + prodFileContent;
|
|
254
|
+
prodFileContent = startStr + mergeFileContent + endStr + "\n" + prodFileContent;
|
|
255
255
|
} else {
|
|
256
256
|
// If previous customization exists
|
|
257
257
|
let beforeMerge = prodFileContent.indexOf(startStr);
|
|
@@ -51,8 +51,9 @@ async function _syncFiles(executionType, cmdEnv, from, to, extraOptions = []) {
|
|
|
51
51
|
"--delete",
|
|
52
52
|
"--chmod=Fg+w",
|
|
53
53
|
"--no-perms",
|
|
54
|
+
"--filter='merge " + path.resolve(__dirname,"rsyncFilter-pre.txt") + "'",
|
|
54
55
|
cmdEnv.rsyncFilter ? "--filter='merge " + cmdEnv.rsyncFilter + "'" : "",
|
|
55
|
-
"--filter='merge " + path.resolve(__dirname,"rsyncFilter.txt") + "'",
|
|
56
|
+
"--filter='merge " + path.resolve(__dirname,"rsyncFilter-post.txt") + "'",
|
|
56
57
|
executionType == _syncFiles.COPY ? "-v" : "--dry-run"
|
|
57
58
|
].concat(productExtraOptions),
|
|
58
59
|
{ shell: true, env: { "RSYNC_RSH": "ssh -v -o ConnectTimeout=30 -o ServerAliveInterval=30 -o ServerAliveCountMax=30" } }
|
|
@@ -9,25 +9,4 @@
|
|
|
9
9
|
- /hornetq
|
|
10
10
|
- /elasticsearch
|
|
11
11
|
- /db
|
|
12
|
-
- /reports
|
|
13
|
-
|
|
14
|
-
- health.conf
|
|
15
|
-
|
|
16
|
-
- uploaded
|
|
17
|
-
- .processed
|
|
18
|
-
- .failed
|
|
19
|
-
- recordm-importer.log*
|
|
20
|
-
- recordm-importer*.jar
|
|
21
|
-
|
|
22
|
-
- node_modules
|
|
23
|
-
- .git
|
|
24
|
-
- .gitkeep
|
|
25
|
-
- *.rc
|
|
26
|
-
- *.iml
|
|
27
|
-
- *.swap
|
|
28
|
-
- *.swp
|
|
29
|
-
- .DS_Store
|
|
30
|
-
- .env.json
|
|
31
|
-
- .idea
|
|
32
|
-
|
|
33
|
-
- **.ENV__*__.*
|
|
12
|
+
- /reports
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
- health.conf
|
|
2
|
+
|
|
3
|
+
- uploaded
|
|
4
|
+
- .processed
|
|
5
|
+
- .failed
|
|
6
|
+
- recordm-importer.log*
|
|
7
|
+
- recordm-importer*.jar
|
|
8
|
+
|
|
9
|
+
- node_modules
|
|
10
|
+
- .git
|
|
11
|
+
- .gitkeep
|
|
12
|
+
- *.rc
|
|
13
|
+
- *.iml
|
|
14
|
+
- *.swap
|
|
15
|
+
- *.swp
|
|
16
|
+
- .DS_Store
|
|
17
|
+
- .env.json
|
|
18
|
+
- .idea
|
|
19
|
+
|
|
20
|
+
- **.ENV__*__.*
|
package/package.json
CHANGED