Merge pull request #113 from xcz1997/master

fix 修复DEBIAN目录下脚本文件已配置但未加入到包项中的问题
dotnet-campus · Mar 15, 2024 · f4c6167 · f4c6167
2 parents 8516168 + 71e1601
commit f4c6167
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 5 deletions.
diff --git a/DebUOS/Packaging.DebUOS.NuGet/Build/package.targets b/DebUOS/Packaging.DebUOS.NuGet/Build/package.targets
@@ -48,6 +48,26 @@
       <DebUOSPackingWriteArgLine Include="$(DebControlFile)"/>
       <DebUOSPackingWriteArgLine Include=">"/>
 
+      <DebUOSPackingWriteArgLine Include=">"/>
+      <DebUOSPackingWriteArgLine Include="DebPostinstFile" Condition="$(DebPostinstFile)!=''"/>
+      <DebUOSPackingWriteArgLine Include="$(DebPostinstFile)"/>
+      <DebUOSPackingWriteArgLine Include=">"/>
+
+      <DebUOSPackingWriteArgLine Include=">"/>
+      <DebUOSPackingWriteArgLine Include="DebPrermFile" Condition="$(DebPrermFile)!=''"/>
+      <DebUOSPackingWriteArgLine Include="$(DebPrermFile)"/>
+      <DebUOSPackingWriteArgLine Include=">"/>
+
+      <DebUOSPackingWriteArgLine Include=">"/>
+      <DebUOSPackingWriteArgLine Include="DebPostrmFile" Condition="$(DebPostrmFile)!=''"/>
+      <DebUOSPackingWriteArgLine Include="$(DebPostrmFile)"/>
+      <DebUOSPackingWriteArgLine Include=">"/>
+
+      <DebUOSPackingWriteArgLine Include=">"/>
+      <DebUOSPackingWriteArgLine Include="DebPreinstFile" Condition="$(DebPreinstFile)!=''"/>
+      <DebUOSPackingWriteArgLine Include="$(DebPreinstFile)"/>
+      <DebUOSPackingWriteArgLine Include=">"/>
+
       <DebUOSPackingWriteArgLine Include=">"/>
       <DebUOSPackingWriteArgLine Include="DebInfoFile" Condition="$(DebInfoFile)!=''"/>
       <DebUOSPackingWriteArgLine Include="$(DebInfoFile)"/>

diff --git a/DebUOS/Packaging.DebUOS.Tool/Program.cs b/DebUOS/Packaging.DebUOS.Tool/Program.cs
@@ -55,7 +55,7 @@
     var workingFolder = new DirectoryInfo(configuration.WorkingFolder!);
 
     var debUosPackageCreator = new DebUOSPackageCreator(logger);
-    debUosPackageCreator.PackageDeb(packingFolder, outputDebFile,workingFolder);
+    debUosPackageCreator.PackageDeb(packingFolder, outputDebFile, workingFolder);
 }
 else
 {

diff --git a/DebUOS/Packaging.DebUOS/DebUOSPackageCreator.cs b/DebUOS/Packaging.DebUOS/DebUOSPackageCreator.cs
@@ -85,11 +85,19 @@ private void WriteControl(DirectoryInfo packingFolder, Stream targetStream)
     {
         var controlTar = new MemoryStream();
         WriteControlEntry(controlTar, "./");
+        foreach (var file in new[] { "control", "preinst", "postinst", "prerm", "postrm" })
+        {
+            var filePath = Path.Combine(packingFolder.FullName, "DEBIAN", file);
+            if (File.Exists(filePath))
+            {
+                var fileText = File.ReadAllText(filePath);
+                var mode = file == "control"
+                    ? LinuxFileMode.S_IRUSR | LinuxFileMode.S_IWUSR | LinuxFileMode.S_IRGRP | LinuxFileMode.S_IROTH
+                    : LinuxFileMode.S_IRUSR | LinuxFileMode.S_IWUSR | LinuxFileMode.S_IXUSR;
+                WriteControlEntry(controlTar, $"./{file}", fileText, mode);
+            }
+        }
 
-        var controlFile = Path.Combine(packingFolder.FullName, "DEBIAN", "control");
-        var controlFileText = File.ReadAllText(controlFile);
-
-        WriteControlEntry(controlTar, "./control", controlFileText);
         TarFileCreator.WriteTrailer(controlTar);
         controlTar.Seek(0, SeekOrigin.Begin);