Skip to content
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

fix: rename megasync.desktop to conventional desktop-id scheme #511

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: rename megasync.desktop to conventional desktop-id scheme #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a11257e
fix: rename megasync.desktop to conventional desktop-id scheme
tim77 Nov 16, 2020
eb6f580
fix: rename megasync.desktop to UUID scheme across all project
tim77 Nov 16, 2020
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 build/templates/MEGAsync.debug/megasync-debug.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@ make
%install
make install DESTDIR=%{buildroot}%{_bindir}
#mkdir -p %{buildroot}%{_datadir}/applications
#%{__install} MEGAsync/platform/linux/data/megasync.desktop -D %{buildroot}%{_datadir}/applications
#%{__install} MEGAsync/platform/linux/data/nz.mega.MEGAsync.desktop -D %{buildroot}%{_datadir}/applications

%if 0%{?suse_version}
%suse_update_desktop_file -n -i megasync Network System
%else
desktop-file-install \
--add-category="Network" \
--dir %{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/megasync.desktop
%{buildroot}%{_datadir}/applications/nz.mega.MEGAsync.desktop
%endif

%post
Expand Down Expand Up @@ -232,7 +232,7 @@ killall megasync 2> /dev/null || true
%files
%defattr(-,root,root)
%{_bindir}/%{name}
%{_datadir}/applications/megasync.desktop
%{_datadir}/applications/nz.mega.MEGAsync.desktop
%{_datadir}/icons/hicolor/*/apps/mega.png
%{_datadir}/icons/hicolor/*/*/mega.png

Expand Down
2 changes: 1 addition & 1 deletion build/templates/MEGAsync/megasync.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ killall -s SIGUSR2 megasync 2> /dev/null || true
%files
%defattr(-,root,root)
%{_bindir}/%{name}
%{_datadir}/applications/megasync.desktop
%{_datadir}/applications/nz.mega.MEGAsync.desktop
%{_datadir}/icons/hicolor/*/*/mega.png
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/icons/*/*/*/*
Expand Down
4 changes: 2 additions & 2 deletions src/MEGASync/platform/linux/LinuxPlatform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ NotifyServer *LinuxPlatform::notify_server = NULL;

static QString autostart_dir = QDir::homePath() + QString::fromAscii("/.config/autostart/");

QString LinuxPlatform::desktop_file = autostart_dir + QString::fromAscii("megasync.desktop");
QString LinuxPlatform::desktop_file = autostart_dir + QString::fromAscii("nz.mega.MEGAsync.desktop");
QString LinuxPlatform::set_icon = QString::fromUtf8("gvfs-set-attribute -t string \"%1\" metadata::custom-icon file://%2");
QString LinuxPlatform::remove_icon = QString::fromUtf8("gvfs-set-attribute -t unset \"%1\" metadata::custom-icon");
QString LinuxPlatform::custom_icon = QString::fromUtf8("/usr/share/icons/hicolor/256x256/apps/mega.png");
Expand Down Expand Up @@ -73,7 +73,7 @@ bool LinuxPlatform::startOnStartup(bool value)
return false;
}
}
QString app_desktop = QString::fromAscii("/usr/share/applications/megasync.desktop");
QString app_desktop = QString::fromAscii("/usr/share/applications/nz.mega.MEGAsync.desktop");
if (QFile(app_desktop).exists())
{
return QFile::copy(app_desktop, desktop_file);
Expand Down
0 ...Sync/platform/linux/data/megasync.desktop → ...tform/linux/data/nz.mega.MEGAsync.desktop
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/MEGASync/platform/platform.pri
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ unix:!macx {

# desktop
desktop.path = $$DESKTOP_DESTDIR/share/applications
desktop.files = $$PWD/linux/data/megasync.desktop
desktop.files = $$PWD/linux/data/nz.mega.MEGAsync.desktop
desktop.commands = update-desktop-database &> /dev/null || true
INSTALLS += desktop

Expand Down