Merge 152247f into master

Author: github-actions[bot]

README.md

@@ -16,6 +16,28 @@ my use cases.
 `exe2dist` works on Linux and MacOS. Compressible binaries can be for other
 platforms as well.
 
+## Install
+
+Compiled executables can be downloaded manually from the [releases page](https://github.com/rtmigo/exe2dist_dart/releases).
+
+For use as part of CI/CD, a command-line installation is more suitable.
+
+Download and unpack the Linux version to the current directory in one line.
+
+```bash
+# install
+wget -c https://github.com/rtmigo/exe2dist_dart/releases/download/0.2.2/exe2dist_linux_amd64.tgz -O - | tar -xz
+
+# run
+./exe2dist
+```
+
+Same for the newest version instead of the fixed one.
+
+```bash
+wget -c https://github.com/rtmigo/exe2dist_dart/releases/latest/download/exe2dist_linux_amd64.tgz -O - | tar -xz
+```
+
 ## Use
 
 Archive file `./native_exe` to a distributable 

bin/source/architecture.dart

@@ -1,17 +1,19 @@
 import 'dart:io';
 
 class Architecture {
-  final String string;
+  final String os;
+  final String platform;
 
-  Architecture(this.string);
+  String get combined => "${os}_$platform";
 
-  bool get isWindows => string.startsWith("windows");
+  Architecture(this.os, this.platform);
+
+  bool get isWindows => os == "windows";
 }
 
 class UnknownArchitectureException extends Error {
-  UnknownArchitectureException({
-    required this.processResult
-  });
+  UnknownArchitectureException({required this.processResult});
+
   final ProcessResult processResult;
 
   @override
@@ -20,21 +22,47 @@ class UnknownArchitectureException extends Error {
   }
 }
 
+/*
+  Вопрос, как называть архитектуры:
+
+  RedHat, Fedora, Suse за x86_64:
+    Fedora-Workstation-Live-x86_64-36-1.5.iso
+    Fedora-Workstation-Live-aarch64-36-1.5.iso
+    archlinux-2022.10.01-x86_64.iso
+    SLE-15-SP4-Full-x86_64-GM-Media1.iso
+    SLE-15-SP4-Full-aarch64-GM-Media1.iso
+
+  Википедия пишет:
+    x86-64 (also known as x64, x86_64, AMD64, and Intel 64)
+
+  Debian и производные, FreeBSD за amd64:
+    debian-11.5.0-amd64-netinst.iso
+    debian-11.5.0-arm64-netinst.iso
+    ubuntu-20.04.5-live-server-amd64.iso
+    ubuntu-22.04.1-live-server-arm64.iso
+    FreeBSD-13.1-RELEASE-amd64-disc1.iso
+    FreeBSD-13.1-RELEASE-arm64-aarch64-dvd1.iso
+
+  MX целится только в x86, причём называется своеобразно:
+    MX-21.2.1_x64.iso
+    MX-21.2.1_386.iso
+
+  Я предпочитаю именования Debian, поскольку они не содержат знаков препинания.
+*/
+
 Architecture detectArchitecture(File file) {
   final pr = Process.runSync("file", [file.path]);
   final stdout = pr.stdout.toString();
   bool containsAll(List<String> l) => l.every((s) => stdout.contains(s));
 
   if (containsAll(["Mach-O", "x86_64", "executable"])) {
-    return Architecture("macos_x86-64");
-  } if (containsAll(["Mach-O", "arm64", "executable"])) {
-    return Architecture("macos_arm64");
+    return Architecture("macos", "amd64");
+  } else if (containsAll(["Mach-O", "arm64", "executable"])) {
+    return Architecture("macos", "arm64");
   } else if (containsAll(["for GNU/Linux", "x86-64"])) {
-    return Architecture("linux_x86-64");
+    return Architecture("linux", "amd64");
   } else if (containsAll(["for MS Windows", "PE32+", "x86-64"])) {
-    return Architecture("windows_x86-64");
+    return Architecture("windows", "amd64");
   }
-  throw UnknownArchitectureException(
-    processResult: pr
-  );
-}
+  throw UnknownArchitectureException(processResult: pr);
+}

bin/source/archive.dart

@@ -138,7 +138,7 @@ Future<void> binaryToDist(
       arcFunc = fileToTarGz;
     }
     final targetFile = File(
-        path.join(targetDir.path, "${programName}_${arch.string}$arcSuffix"));
+        path.join(targetDir.path, "${programName}_${arch.combined}$arcSuffix"));
     if (targetFile.existsSync()) {
       throw TargetFileAlreadyExistsException(targetFile);
     }

ghcp.iml

@@ -1,6 +1,6 @@
 name: exe2dist
 description: Binary executable packaging tool.
-version: 0.2.1
+version: 0.2.2
 
 environment:
   sdk: '>=2.18.0 <3.0.0'

pubspec.yaml

@@ -6,12 +6,12 @@ import '../bin/source/architecture.dart';
 
 void main() {
   test("detecting architecture", () {
-    expect(detectArchitecture(File("test/executables/ghcp_linux_amd64")).string,
-        'linux_x86-64');
-    expect(detectArchitecture(File("test/executables/ghcp_osx_amd64")).string,
-        'macos_x86-64');
-    expect(detectArchitecture(File("test/executables/ghcp_windows_amd64")).string,
-        'windows_x86-64');
+    expect(detectArchitecture(File("test/executables/ghcp_linux_amd64")).combined,
+        'linux_amd64');
+    expect(detectArchitecture(File("test/executables/ghcp_osx_amd64")).combined,
+        'macos_amd64');
+    expect(detectArchitecture(File("test/executables/ghcp_windows_amd64")).combined,
+        'windows_amd64');
     expect(()=>detectArchitecture(File("test/executables/labuda.txt")),
         throwsA(isA<UnknownArchitectureException>()));
   });

script/archive.dart

@@ -33,7 +33,7 @@ void main() {
     );
 
     expect(tempDir!.listSync().map((e) => path.basename(e.path)).toList(),
-        ['abc_linux_x86-64.tgz']);
+        ['abc_linux_amd64.tgz']);
   });
 
   test("macos", () async {
@@ -44,7 +44,7 @@ void main() {
     );
 
     expect(tempDir!.listSync().map((e) => path.basename(e.path)).toList(),
-        ['abc_macos_x86-64.tgz']);
+        ['abc_macos_amd64.tgz']);
   });
 
   test("windows", () async {
@@ -55,16 +55,16 @@ void main() {
     );
 
     expect(tempDir!.listSync().map((e) => path.basename(e.path)).toList(),
-        ['abc_windows_x86-64.zip']);
+        ['abc_windows_amd64.zip']);
   });
 
   test("detecting architecture", () {
     // expect(detectArchitecture(File("test/executables/ghcp_linux_amd64")).string,
-    //     'linux_x86-64');
+    //     'linux_amd64');
     // expect(detectArchitecture(File("test/executables/ghcp_osx_amd64")).string,
-    //     'macos_x86-64');
+    //     'macos_amd64');
     // expect(detectArchitecture(File("test/executables/ghcp_windows_amd64")).string,
-    //     'windows_x86-64');
+    //     'windows_amd64');
     // expect(()=>detectArchitecture(File("test/executables/labuda.txt")),
     //     throwsA(isA<UnknownArchitectureException>()));
   });