OSDN Git Service

チケット #38687 tar.gz 形式が 7-ZIP32.DLL がインストールされている環境下で正しく展開されない master
authorttp <ttp@users.sourceforge.jp>
Sun, 21 Oct 2018 15:13:18 +0000 (00:13 +0900)
committerttp <ttp@users.sourceforge.jp>
Sun, 21 Oct 2018 15:13:18 +0000 (00:13 +0900)
na-get-lib/NaGet.InteropServices/CommonArchiverExtracter.cs

index 714d812..9e6ed93 100644 (file)
@@ -1,4 +1,4 @@
-using System;\r
+using System;\r
 using System.Runtime.InteropServices;\r
 using System.IO;\r
 \r
 using System.Runtime.InteropServices;\r
 using System.IO;\r
 \r
@@ -140,11 +140,11 @@ namespace NaGet.InteropServices
                /// アーカイバDLLの設定\r
                /// </summary>\r
                public static readonly CommonArchiverDllConfig[] Configs = {\r
                /// アーカイバDLLの設定\r
                /// </summary>\r
                public static readonly CommonArchiverDllConfig[] Configs = {\r
+                       new CommonArchiverDllConfig("TAR32", "Tar", "-x \"{0}\" -o \"{1}\"", 218), // 7-ZIP32.DLL が tar.gz などをハンドルしないよう TAR32 を優先させる\r
                        new CommonArchiverDllConfig("7-ZIP32", "SevenZip", "x -y \"{0}\" \"-o{1}\"", 423),\r
                        new CommonArchiverDllConfig("UNZIP32", "UnZip", "-x -o \"{0}\" \"{1}\" *", 541),\r
                        new CommonArchiverDllConfig("UNLHA32", "Unlha", "x \"{0}\" \"{1}\" *", 240),\r
                        new CommonArchiverDllConfig("CAB32", "Cab", "-x \"{0}\" \"{1}\" *", 98),\r
                        new CommonArchiverDllConfig("7-ZIP32", "SevenZip", "x -y \"{0}\" \"-o{1}\"", 423),\r
                        new CommonArchiverDllConfig("UNZIP32", "UnZip", "-x -o \"{0}\" \"{1}\" *", 541),\r
                        new CommonArchiverDllConfig("UNLHA32", "Unlha", "x \"{0}\" \"{1}\" *", 240),\r
                        new CommonArchiverDllConfig("CAB32", "Cab", "-x \"{0}\" \"{1}\" *", 98),\r
-                       new CommonArchiverDllConfig("TAR32", "Tar", "-x \"{0}\" -o \"{1}\"", 218),\r
                        new CommonArchiverDllConfig("UNGCA32", "UnGCA", "e \"{0}\" \"{1}\"", 10), // いるかな?\r
                        \r
                        //new CommonArchiverDllConfig("UNRAR32", "Unrar", "x -y \"{0}\" \"{1}\" *", -1),\r
                        new CommonArchiverDllConfig("UNGCA32", "UnGCA", "e \"{0}\" \"{1}\"", 10), // いるかな?\r
                        \r
                        //new CommonArchiverDllConfig("UNRAR32", "Unrar", "x -y \"{0}\" \"{1}\" *", -1),\r