Merge branch 'dev' of github.com:github0null/eide into dev

github0null · github0null · commit 95197e6d51ae · 2023-04-16T15:13:03.000+08:00
diff --git a/src/Compress.ts b/src/Compress.ts
@@ -40,7 +40,6 @@ export type SevenZipUnzipExcludeList = { name: string, recurse?: boolean }[];
 export class SevenZipper {
 
     static readonly MaxStep = 18;
-    static readonly ExcludeCmdSep = platform.osType() == 'win32' ? '!' : '\\!';
 
     private _7za: File;
     private _event: events.EventEmitter;
@@ -155,7 +154,7 @@ export class SevenZipper {
 
             if (option.excludeList) {
                 for (let excludeReg of option.excludeList) {
-                    paramList.push('-xr' + SevenZipper.ExcludeCmdSep + excludeReg.trim());
+                    paramList.push('-xr!' + excludeReg.trim());
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ export type SevenZipUnzipExcludeList = { name: string, recurse?: boolean }[];`
`40`	`40`	`export class SevenZipper {`
`41`	`41`
`42`	`42`	`static readonly MaxStep = 18;`
`43`		`- static readonly ExcludeCmdSep = platform.osType() == 'win32' ? '!' : '\\!';`
`44`	`43`
`45`	`44`	`private _7za: File;`
`46`	`45`	`private _event: events.EventEmitter;`
`@@ -155,7 +154,7 @@ export class SevenZipper {`
`155`	`154`
`156`	`155`	`if (option.excludeList) {`
`157`	`156`	`for (let excludeReg of option.excludeList) {`
`158`		`- paramList.push('-xr' + SevenZipper.ExcludeCmdSep + excludeReg.trim());`
	`157`	`+ paramList.push('-xr!' + excludeReg.trim());`
`159`	`158`	`}`
`160`	`159`	`}`
`161`	`160`