OSDN > Find Software > System > Installation/Setup > AppliStation > SCM > git > AppliStation > Commit

AppliStation
Fork

AppliStation: Commit

AppliStation

チケット #38687 tar.gz 形式が 7-ZIP32.DLL がインストールされている環境下で正しく展開されない

--- a/na-get-lib/NaGet.InteropServices/CommonArchiverExtracter.cs

+++ b/na-get-lib/NaGet.InteropServices/CommonArchiverExtracter.cs

		@@ -1,4 +1,4 @@
1		-using System;
	1	+using System;
2	2	using System.Runtime.InteropServices;
3	3	using System.IO;
4	4

		@@ -140,11 +140,11 @@ namespace NaGet.InteropServices
140	140	/// アーカイバDLLの設定
141	141	/// </summary>
142	142	public static readonly CommonArchiverDllConfig[] Configs = {
	143	+ new CommonArchiverDllConfig("TAR32", "Tar", "-x \"{0}\" -o \"{1}\"", 218), // 7-ZIP32.DLL が tar.gz などをハンドルしないよう TAR32 を優先させる
143	144	new CommonArchiverDllConfig("7-ZIP32", "SevenZip", "x -y \"{0}\" \"-o{1}\"", 423),
144	145	new CommonArchiverDllConfig("UNZIP32", "UnZip", "-x -o \"{0}\" \"{1}\" *", 541),
145	146	new CommonArchiverDllConfig("UNLHA32", "Unlha", "x \"{0}\" \"{1}\" *", 240),
146	147	new CommonArchiverDllConfig("CAB32", "Cab", "-x \"{0}\" \"{1}\" *", 98),
147		- new CommonArchiverDllConfig("TAR32", "Tar", "-x \"{0}\" -o \"{1}\"", 218),
148	148	new CommonArchiverDllConfig("UNGCA32", "UnGCA", "e \"{0}\" \"{1}\"", 10), // いるかな?
149	149
150	150	//new CommonArchiverDllConfig("UNRAR32", "Unrar", "x -y \"{0}\" \"{1}\" *", -1),