Skip to content

fix(rpm): enforce usage of appBinaryName for assets and fix symlink logic #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eximius313 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(rpm): enforce usage of appBinaryName for assets and fix symlink logic #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/flutter_app_packager/lib/src/makers/rpm/app_package_maker_rpm.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class AppPackageMakerRPM extends AppPackageMaker {
iconFile?.copy(
path.join(
buildPath,
makeConfig.appName + path.extension(iconFile.path),
makeConfig.appBinaryName + path.extension(iconFile.path),
),
);

Expand Down Expand Up @@ -153,9 +153,9 @@ class AppPackageMakerRPM extends AppPackageMaker {
}

// create & write the files got from makeConfig
final specFile = File(path.join(specsPath, '${makeConfig.appName}.spec'));
final specFile = File(path.join(specsPath, '${makeConfig.appBinaryName}.spec'));
final desktopEntryFile =
File(path.join(buildPath, '${makeConfig.appName}.desktop'));
File(path.join(buildPath, '${makeConfig.appBinaryName}.desktop'));

if (!specFile.existsSync()) specFile.createSync();
if (!desktopEntryFile.existsSync()) desktopEntryFile.createSync();
Expand Down
10 changes: 5 additions & 5 deletions packages/flutter_app_packager/lib/src/makers/rpm/make_rpm_config.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'dart:io';

import 'package:flutter_app_packager/src/api/app_package_maker.dart';

class MakeRPMConfig extends MakeConfig {
class MakeRPMConfig extends MakeLinuxPackageConfig {
MakeRPMConfig({
// Desktop file
required this.displayName,
Expand Down Expand Up @@ -132,10 +132,10 @@ class MakeRPMConfig extends MakeConfig {
'mkdir -p %{buildroot}%{_datadir}/metainfo',
'mkdir -p %{buildroot}%{_datadir}/pixmaps',
'cp -r %{name}/* %{buildroot}%{_datadir}/%{name}',
'ln -s %{_datadir}/%{name}/%{name} %{buildroot}%{_bindir}/%{name}',
'cp -r %{name}.desktop %{buildroot}%{_datadir}/applications',
'cp -r %{name}.png %{buildroot}%{_datadir}/pixmaps',
'cp -r %{name}*.xml %{buildroot}%{_datadir}/metainfo || :',
'ln -s %{_datadir}/%{name}/$appBinaryName %{buildroot}%{_bindir}/%{name}',
'cp -r $appBinaryName.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop',
'cp -r $appBinaryName.png %{buildroot}%{_datadir}/pixmaps/%{name}.png',
'cp -r $appBinaryName*.xml %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml || :',
'update-mime-database %{_datadir}/mime &> /dev/null || :',
].join('\n'),
'%postun': ['update-mime-database %{_datadir}/mime &> /dev/null || :']
Expand Down