Revamp the linUX

docs/en/makers/appimage.md

@@ -27,6 +27,7 @@ mv appimagetool /usr/local/bin/
 Add `make_config.yaml` to your project `linux/packaging/appimage` directory.
 
 ```yaml
+package_name: hello_world
 display_name: Hello World
 
 icon: assets/logo.png

docs/en/makers/rpm.md

@@ -16,6 +16,7 @@ Install requirements:
 Add `make_config.yaml` to your project `linux/packaging/rpm` directory.
 
 ```yaml
+package_name: hello-world
 icon: assets/logo.png
 summary: A really cool application
 group: Application/Emulator

docs/zh/makers/appimage.md

@@ -27,6 +27,7 @@ mv appimagetool /usr/local/bin/
 将 `make_config.yaml` 添加到您的项目 `linux/packaging/appimage` 目录。
 
 ```yaml
+package_name: hello_world
 display_name: Hello World
 
 icon: assets/logo.png

docs/zh/makers/rpm.md

@@ -16,6 +16,7 @@
 将 `make_config.yaml` 添加到您的项目 `linux/packaging/rpm` 目录。
 
 ```yaml
+package_name: hello-world
 icon: assets/logo.png
 summary: A really cool application
 group: Application/Emulator

packages/fastforge/pubspec.yaml

@@ -1,6 +1,6 @@
 name: fastforge
 description: A powerful and efficient tool for packaging and publishing your applications with ease.
-version: 0.6.6
+version: 0.6.7
 homepage: https://fastforge.dev
 repository: https://github.com/fastforgedev/fastforge/tree/main/packages/fastforge
 issue_tracker: https://github.com/fastforgedev/fastforge/issues
@@ -14,7 +14,8 @@ environment:
   sdk: ">=2.16.0 <4.0.0"
 
 dependencies:
-  unified_distributor: ^0.2.6
+  unified_distributor:
+    path: ../unified_distributor
 
 dev_dependencies:
   dependency_validator: ^3.0.0

packages/flutter_app_packager/lib/src/makers/appimage/app_package_maker_appimage.dart

@@ -2,6 +2,7 @@ import 'dart:io';
 
 import 'package:flutter_app_packager/src/api/app_package_maker.dart';
 import 'package:flutter_app_packager/src/makers/appimage/make_appimage_config.dart';
+import 'package:image/image.dart' as img;
 import 'package:path/path.dart' as path;
 import 'package:shell_executor/shell_executor.dart';
 
@@ -85,7 +86,16 @@ class AppPackageMakerAppImage extends AppPackageMaker {
         ),
       )..createSync(recursive: true);
 
-      await desktopFile.writeAsString(makeConfig.desktopFileContent);
+      // Use custom desktop file if specified, otherwise use generated content
+      if (makeConfig.desktopFile != null) {
+        final customDesktopFile = File(path.join(Directory.current.path, makeConfig.desktopFile!));
+        if (!customDesktopFile.existsSync()) {
+          throw MakeError("Desktop file ${makeConfig.desktopFile} path wasn't found");
+        }
+        await customDesktopFile.copy(desktopFile.path);
+      } else {
+        await desktopFile.writeAsString(makeConfig.desktopFileContent);
+      }
 
       final appRunFile = File(
         path.join(
@@ -116,38 +126,33 @@ class AppPackageMakerAppImage extends AppPackageMaker {
         ),
       );
 
-      final icon256x256 = path.join(
-        makeConfig.packagingDirectory.path,
-        '${makeConfig.appName}.AppDir/usr/share/icons/hicolor/256x256/apps',
-      );
-      final icon128x128 = path.join(
-        makeConfig.packagingDirectory.path,
-        '${makeConfig.appName}.AppDir/usr/share/icons/hicolor/128x128/apps',
-      );
-
-      await $('mkdir', [
-        '-p',
-        icon128x128,
-        icon256x256,
-      ]).then((value) {
-        if (value.exitCode != 0) {
-          throw MakeError(value.stderr as String);
-        }
-      });
+      for (final size in [128, 256, 512]) {
+        final iconDir = path.join(
+          makeConfig.packagingDirectory.path,
+          '${makeConfig.appName}.AppDir/usr/share/icons/hicolor/${size}x$size/apps',
+        );
+        final mkdirProcessRes = await $('mkdir', [
+          '-p',
+          iconDir,
+        ]);
 
-      await iconFile.copy(
-        path.join(
-          icon128x128,
-          '${makeConfig.appName}${path.extension(makeConfig.icon)}',
-        ),
-      );
+        if (mkdirProcessRes.exitCode != 0) throw MakeError();
 
-      await iconFile.copy(
-        path.join(
-          icon256x256,
-          '${makeConfig.appName}${path.extension(makeConfig.icon)}',
-        ),
-      );
+        final iconBytes = await iconFile.readAsBytes();
+        final decodedIcon = img.decodeImage(iconBytes);
+        if (decodedIcon == null) {
+          throw MakeError('Failed to decode icon: ${makeConfig.icon}');
+        }
+        final icon = img.copyResize(
+          decodedIcon,
+          width: size,
+          height: size,
+          interpolation: img.Interpolation.average,
+        );
+        final newIconFile =
+            File(path.join(iconDir, '${makeConfig.appName}.png'));
+        await newIconFile.writeAsBytes(img.encodePng(icon));
+      }
 
       if (makeConfig.metainfo != null) {
         final metainfoDir = path.join(

packages/flutter_app_packager/lib/src/makers/appimage/make_appimage_config.dart

@@ -22,36 +22,38 @@ class AppImageAction {
   List<String> arguments;
 
   Map<String, dynamic> toJson() {
-    return {
-      'label': label,
-      'name': name,
-      'arguments': arguments,
-    };
+    return {'label': label, 'name': name, 'arguments': arguments};
   }
 }
 
 class MakeAppImageConfig extends MakeConfig {
   MakeAppImageConfig({
+    this.packageName,
     required this.displayName,
     required this.icon,
     this.keywords = const [],
     this.categories = const [],
     this.actions = const [],
     this.include = const [],
     this.startupNotify = true,
+    this.startupWMClass,
     this.genericName = 'A Flutter Application',
     this.supportedMimeType,
     this.metainfo,
+    this.desktopFile,
   });
   factory MakeAppImageConfig.fromJson(Map<String, dynamic> map) {
     return MakeAppImageConfig(
+      packageName: map['package_name'] as String?,
       displayName: map['display_name'] as String,
       icon: map['icon'] as String,
       metainfo: map['metainfo'] as String?,
+      desktopFile: map['desktop_file'] as String?,
       include: (map['include'] as List<dynamic>? ?? []).cast<String>(),
       keywords: (map['keywords'] as List<dynamic>? ?? []).cast<String>(),
       categories: (map['categories'] as List<dynamic>? ?? []).cast<String>(),
       startupNotify: map['startup_notify'] as bool? ?? false,
+      startupWMClass: map['startup_wm_class'] as String?,
       genericName: map['generic_name'] as String? ?? 'A Flutter Application',
       actions: (map['actions'] as List? ?? [])
           .map(
@@ -66,13 +68,19 @@ class MakeAppImageConfig extends MakeConfig {
     );
   }
 
+  @override
+  String get appName => packageName ?? super.appName;
+
   final String icon;
   final String? metainfo;
+  final String? desktopFile;
   final List<String> keywords;
   final List<String> categories;
   final List<AppImageAction> actions;
   final bool startupNotify;
+  final String? startupWMClass;
   final String genericName;
+  final String? packageName;
   final String displayName;
   final List<String> include;
   List<String>? supportedMimeType;
@@ -85,6 +93,7 @@ class MakeAppImageConfig extends MakeConfig {
       'Icon': appName,
       'Type': 'Application',
       'StartupNotify': startupNotify ? 'true' : 'false',
+      if (startupWMClass != null) 'StartupWMClass': startupWMClass,
       if (supportedMimeType != null && supportedMimeType!.isNotEmpty)
         'MimeType': '${supportedMimeType!.join(';')};',
       if (categories.isNotEmpty) 'Categories': categories.join(';'),
@@ -93,14 +102,16 @@ class MakeAppImageConfig extends MakeConfig {
         'Actions': this.actions.map((e) => e.label).join(';'),
     }.entries.map((e) => '${e.key}=${e.value}').join('\n');
 
-    final actions = this.actions.map((action) {
-      final fields = {
-        'Name': action.name,
-        'Exec':
-            'LD_LIBRARY_PATH=usr/lib $appName ${action.arguments.join(' ')} %u',
-      };
-      return '[Desktop Action ${action.label}]\n${fields.entries.map((e) => '${e.key}=${e.value}').join('\n')}';
-    }).join('\n\n');
+    final actions = this.actions
+        .map((action) {
+          final fields = {
+            'Name': action.name,
+            'Exec':
+                'LD_LIBRARY_PATH=usr/lib $appName ${action.arguments.join(' ')} %u',
+          };
+          return '[Desktop Action ${action.label}]\n${fields.entries.map((e) => '${e.key}=${e.value}').join('\n')}';
+        })
+        .join('\n\n');
 
     return '[Desktop Entry]\n$fields\n\n$actions';
   }

packages/flutter_app_packager/lib/src/makers/deb/app_package_maker_deb.dart

@@ -2,6 +2,7 @@ import 'dart:io';
 
 import 'package:flutter_app_packager/src/api/app_package_maker.dart';
 import 'package:flutter_app_packager/src/makers/deb/make_deb_config.dart';
+import 'package:image/image.dart' as img;
 import 'package:path/path.dart' as path;
 import 'package:shell_executor/shell_executor.dart';
 
@@ -46,18 +47,11 @@ class AppPackageMakerDeb extends AppPackageMaker {
     /// /usr/share/applications
     /// /usr/share/icons/hicolor/128x128/apps
     /// /usr/share/icons/hicolor/256x256/apps
+    /// /usr/share/icons/hicolor/512x512/apps
 
     final debianDir = path.join(packagingDirectory.path, 'DEBIAN');
     final applicationsDir =
         path.join(packagingDirectory.path, 'usr/share/applications');
-    final icon128Dir = path.join(
-      packagingDirectory.path,
-      'usr/share/icons/hicolor/128x128/apps',
-    );
-    final icon256Dir = path.join(
-      packagingDirectory.path,
-      'usr/share/icons/hicolor/256x256/apps',
-    );
     final metainfoDir =
         path.join(packagingDirectory.path, 'usr/share/metainfo');
     final mkdirProcessResult = await $('mkdir', [
@@ -66,7 +60,6 @@ class AppPackageMakerDeb extends AppPackageMaker {
       path.join(packagingDirectory.path, 'usr/share', makeConfig.appBinaryName),
       applicationsDir,
       if (makeConfig.metainfo != null) metainfoDir,
-      if (makeConfig.icon != null) ...[icon128Dir, icon256Dir],
     ]);
 
     if (mkdirProcessResult.exitCode != 0) throw MakeError();
@@ -77,18 +70,33 @@ class AppPackageMakerDeb extends AppPackageMaker {
         throw MakeError("provided icon ${makeConfig.icon} path wasn't found");
       }
 
-      await iconFile.copy(
-        path.join(
-          icon128Dir,
-          makeConfig.appBinaryName + path.extension(makeConfig.icon!),
-        ),
-      );
-      await iconFile.copy(
-        path.join(
-          icon256Dir,
-          makeConfig.appBinaryName + path.extension(makeConfig.icon!),
-        ),
-      );
+      for (final size in [128, 256, 512]) {
+        final iconDir = path.join(
+          packagingDirectory.path,
+          'usr/share/icons/hicolor/${size}x$size/apps',
+        );
+        final mkdirProcessRes = await $('mkdir', [
+          '-p',
+          iconDir,
+        ]);
+
+        if (mkdirProcessRes.exitCode != 0) throw MakeError();
+
+        final iconBytes = await iconFile.readAsBytes();
+        final decodedIcon = img.decodeImage(iconBytes);
+        if (decodedIcon == null) {
+          throw MakeError('Failed to decode icon: ${makeConfig.icon}');
+        }
+        final icon = img.copyResize(
+          decodedIcon,
+          width: size,
+          height: size,
+          interpolation: img.Interpolation.average,
+        );
+        final newIconFile =
+            File(path.join(iconDir, '${makeConfig.appBinaryName}.png'));
+        await newIconFile.writeAsBytes(img.encodePng(icon));
+      }
     }
     if (makeConfig.metainfo != null) {
       final metainfoPath =
@@ -118,7 +126,18 @@ class AppPackageMakerDeb extends AppPackageMaker {
     if (!desktopEntryFile.existsSync()) desktopEntryFile.createSync();
 
     await controlFile.writeAsString(files['CONTROL']!);
-    await desktopEntryFile.writeAsString(files['DESKTOP']!);
+
+    // Use custom desktop file if specified, otherwise use generated content
+    if (makeConfig.desktopFile != null) {
+      final customDesktopFile = File(path.join(Directory.current.path, makeConfig.desktopFile!));
+      if (!customDesktopFile.existsSync()) {
+        throw MakeError("Desktop file ${makeConfig.desktopFile} path wasn't found");
+      }
+      await customDesktopFile.copy(desktopEntryFile.path);
+    } else {
+      await desktopEntryFile.writeAsString(files['DESKTOP']!);
+    }
+
     await postinstFile.writeAsString(files['postinst']!);
     await postrmFile.writeAsString(files['postrm']!);