beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

linux: Keep the normal app id for nightlies

Browse source
This commit is contained in:
Hylke Bons 2018-08-05 16:19:18 +01:00
parent eda316eb3c
commit 26c89feaea
5 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
SparkleShare/Linux/Images/icons/meson.build
View file

@ -3,25 +3,24 @@ theme_dir = join_paths(get_option('prefix'), 'share', 'icons', 'hicolor')
icon_sizes = ['16', '24', '48', '256', '512']
app_icon_name = 'org.sparkleshare.SparkleShare'
target_icon_name = app_icon_name
source_icon_name = app_icon_name
if get_option('nightly')
target_icon_name = app_icon_name + '.Nightly'
source_icon_name = app_icon_name + '.Nightly'
endif
foreach size : icon_sizes
icon_dir = join_paths(size + 'x' + size, 'apps')
install_data(
sources: join_paths('hicolor', icon_dir, app_icon_name + '.png'),
sources: join_paths('hicolor', icon_dir, source_icon_name + '.png'),
install_dir: join_paths(theme_dir, icon_dir),
rename: target_icon_name + '.png')
rename: app_icon_name + '.png')
endforeach
install_data(
sources: join_paths('hicolor', 'symbolic', 'apps', app_icon_name + '-symbolic.svg'),
install_dir: join_paths(theme_dir, 'symbolic', 'apps'),
rename: target_icon_name + '-symbolic.svg')
install_dir: join_paths(theme_dir, 'symbolic', 'apps'))
# Install the status icons
@ -33,18 +32,15 @@ status_icons = ['syncing',
foreach icon : status_icons
install_data(
sources: join_paths('hicolor', '24x24', 'status', app_icon_name + '-' + icon + '.png'),
install_dir: join_paths(theme_dir, '24x24', 'apps'),
rename: target_icon_name + '-' + icon + '.png')
install_dir: join_paths(theme_dir, '24x24', 'apps'))
install_data(
sources: join_paths('hicolor', '48x48', 'status', app_icon_name + '-' + icon + '.png'),
install_dir: join_paths(theme_dir, '48x48', 'apps'),
rename: target_icon_name + '-' + icon + '.png')
install_dir: join_paths(theme_dir, '48x48', 'apps'))
install_data(
sources: join_paths('hicolor', 'symbolic', 'status', app_icon_name + '-' + icon + '-symbolic.svg'),
install_dir: join_paths(theme_dir, 'symbolic', 'apps'),
rename: target_icon_name + '-' + icon + '-symbolic.svg')
install_dir: join_paths(theme_dir, 'symbolic', 'apps'))
endforeach

2
SparkleShare/Linux/UserInterface.cs
View file

@ -38,7 +38,7 @@ namespace SparkleShare
public string SecondaryTextColor;
public string SecondaryTextColorSelected;
public static readonly string APP_ID = "org.sparkleshare.SparkleShare.Nightly";
public static readonly string APP_ID = "org.sparkleshare.SparkleShare";
Application application;

8
SparkleShare/Linux/meson.build
View file

@ -28,12 +28,16 @@ configure_file(
# .desktop and .appdata files
apps_dir = join_paths(get_option('prefix'), 'share', 'applications')
install_data(sources: 'org.sparkleshare.SparkleShare.desktop', install_dir: apps_dir)
install_data(sources: 'org.sparkleshare.SparkleShare.Nightly.desktop', install_dir: apps_dir)
install_data(sources: 'org.sparkleshare.SparkleShare.Invites.desktop', install_dir: apps_dir)
install_data(sources: 'SparkleShare.Autostart.desktop', install_dir: apps_dir)
install_data(sources: 'org.sparkleshare.SparkleShare.appdata.xml', install_dir: join_paths(get_option('prefix'), 'share', 'appdata'))
if get_option('nightly')
install_data(sources: 'org.sparkleshare.SparkleShare.Nightly.desktop', install_dir: apps_dir)
else
install_data(sources: 'org.sparkleshare.SparkleShare.desktop', install_dir: apps_dir)
endif
# Build SparkleShare
gtk = dependency('gtk-sharp-3.0')

4
SparkleShare/Linux/org.sparkleshare.SparkleShare.Nightly.desktop
View file

@ -1,8 +1,8 @@
[Desktop Entry]
Type=Application
Name=SparkleShare – Nightly
Name=SparkleShare (Nightly)
Exec=sparkleshare
Icon=org.sparkleshare.SparkleShare.Nightly
Icon=org.sparkleshare.SparkleShare
Terminal=false
Categories=Network;FileTransfer;GNOME;GTK;
X-GNOME-UsesNotifications=true

1
Sparkles/InstallationInfo.Directory.cs.in
View file

@ -27,3 +27,4 @@ namespace Sparkles {
public const string Directory = "@ABS_INSTALL_DIR@";
}
}