diff options
author | Andreas Fankhauser hiddenalpha.ch | 2024-09-06 17:08:52 +0200 |
---|---|---|
committer | Andreas Fankhauser hiddenalpha.ch | 2024-09-06 17:08:52 +0200 |
commit | 81387fdaed126866f42477dc5d225f99a2ecb07b (patch) | |
tree | 3b4e748dae679e23c861b988a6abedfcdacb147e | |
parent | 62616e8c7af80c8ca63f2134c1a6c5d2a5814fae (diff) | |
download | UnspecifiedGarbage-81387fdaed126866f42477dc5d225f99a2ecb07b.zip UnspecifiedGarbage-81387fdaed126866f42477dc5d225f99a2ecb07b.tar.gz |
stuff
-rw-r--r-- | doc/note/git/git.txt | 5 | ||||
-rw-r--r-- | doc/note/windoof/firewall-holes.txt | 6 | ||||
-rw-r--r-- | src/main/paisa-nonslim/foo.js | 7 |
3 files changed, 13 insertions, 5 deletions
diff --git a/doc/note/git/git.txt b/doc/note/git/git.txt index a4e8e26..d0325a1 100644 --- a/doc/note/git/git.txt +++ b/doc/note/git/git.txt @@ -33,6 +33,11 @@ twice with colon in between): git fetch origin --depth=1 refs/tags/v1.2.3:refs/tags/v1.2.3 +## History digging for specific file + + git log --follow -- path/to/file + + ## Auto-destroy code-format && REMOTENAME=upstream \ diff --git a/doc/note/windoof/firewall-holes.txt b/doc/note/windoof/firewall-holes.txt index 02ef0a5..3b6f579 100644 --- a/doc/note/windoof/firewall-holes.txt +++ b/doc/note/windoof/firewall-holes.txt @@ -29,13 +29,13 @@ Beispiel 3 (Lazlar, UNTESTED): | Windows Registry Editor Version 5.00 | | [HKEY_LOCAL_MACHINE\Software\WOW6432Node\AutoInst\WindowsFirewall\016_Projekte_ISA_Lazlar_mDNS] -| "000local-0000-0010-0010-000000000018"="v2.30|Action=Allow|Active=TRUE|Dir=Out|Protocol=17|Profile=Public|RPort=5353|RA4=192.168.0.0/16|Name=public_local_ISA_Lazlar-out|Desc=public_local_ISA_Lazlar-out: Bonjour service discovery development|" -| "000local-0000-0001-0010-000000000018"="v2.30|Action=Allow|Active=TRUE|Dir=In|Protocol=17|Profile=Public|LPort=5353|LA4=192.168.0.0/16|Name=public_local_ISA_Lazlar-inn|Desc=public_local_ISA_Lazlar-inn: Bonjour service discovery development|" +| "000local-0000-0010-0010-000000000018"="v2.30|Action=Allow|Active=TRUE|Dir=Out|Protocol=17|Profile=Public|RPort=5353|RA4=224.0.0.251/4|Name=public_local_ISA_Lazlar-out|Desc=public_local_ISA_Lazlar-out: Bonjour service discovery development|" +| "000local-0000-0001-0010-000000000018"="v2.30|Action=Allow|Active=TRUE|Dir=In|Protocol=17|Profile=Public|LPort=5353|LA4=224.0.0.251/4|Name=public_local_ISA_Lazlar-inn|Desc=public_local_ISA_Lazlar-inn: Bonjour service discovery development|" +----------------------------------------------------------------------- SideNote: -- Protocol (6 für TCP, 17 für UDP) +- Protocol (6=TCP, 17=UDP) - RPort (Remote Port) - LPort (Local Port) - RA4 (Remote Address IPv4) diff --git a/src/main/paisa-nonslim/foo.js b/src/main/paisa-nonslim/foo.js index ef08bcc..64f72c4 100644 --- a/src/main/paisa-nonslim/foo.js +++ b/src/main/paisa-nonslim/foo.js @@ -184,7 +184,7 @@ Related: var patchAsStr; var mangledPlatformVersion, mangledServiceVersion, mangledSlartiVersion; var propsToReplace = [ "j21.service.mangledVersion", "j21.platform.version", - "j21.captain.mangledVersion", "j21.slarti.mangledVersion" ]; + "j21.captain.mangledVersion", "j21.slarti.mangledVersion", "j21.megacamel.mangledVersion" ]; var propValsByKey = {}; fs.readFile(path, 'utf8', TODO_sBECAHhRAgCcPAIA); function TODO_sBECAHhRAgCcPAIA( ex, patchAsStr_ ){ @@ -202,6 +202,7 @@ Related: if( !new RegExp("\\${"+ k +"}").test(patchAsStr) ){ getNextProperty(); return; } var subj = false ? null : (k == "j21.service.mangledVersion") ? thingyName + : (k == "j21.megacamel.mangledVersion") ? thingyName : (k == "j21.platform.version") ? "platform" : null; if( !subj ){ subj = /^j21.([^.]+).mangledVersion$/.exec(k)[1]; } @@ -218,6 +219,8 @@ Related: var v = propValsByKey[k]; patchAsStr = patchAsStr.replace(new RegExp("\\${"+ k +"}", "g"), v); } + var m = /(\$\{j21.*})/.exec(patchAsStr); + if( m ){ onDone(Error("Unresolved property '"+ m[1] +"' in '"+ path +"'")); return; } onDone(null, patchAsStr); } } @@ -731,7 +734,7 @@ Related: if( !patchStr ){ TODO_qCICAFEnAgD7FgIA(); return; } log.write("[DEBUG] Custom patch for '"+ jettyService +"'\n"); var child = child_process.spawn( - "patch", [ "-p", "1" ], { cwd: workdirOfSync(app, jettyService) } + "patch", [ "-p", "1", "--no-backup-if-mismatch" ], { cwd: workdirOfSync(app, jettyService) } ); child.on("error", console.error.bind(console)); child.stderr.on("data", logAsString); |