Correctly check for running flatpak
This commit is contained in:
parent
6bcc071f9e
commit
30c4d10967
|
@ -205,14 +205,13 @@ namespace SparkleShare {
|
||||||
{
|
{
|
||||||
string version = InstallationInfo.Version;
|
string version = InstallationInfo.Version;
|
||||||
|
|
||||||
if (InstallationInfo.Directory.StartsWith ("/app", StringComparison.InvariantCulture))
|
if (InstallationInfo.IsFlatpak)
|
||||||
version += " (Flatpak)";
|
version += " (Flatpak)";
|
||||||
|
|
||||||
Logger.LogInfo ("Environment", "SparkleShare " + version);
|
Logger.LogInfo ("Environment", "SparkleShare " + version);
|
||||||
Logger.LogInfo ("Environment", "Git LFS " + Sparkles.Git.GitCommand.GitLFSVersion);
|
Logger.LogInfo ("Environment", "Git LFS " + Sparkles.Git.GitCommand.GitLFSVersion);
|
||||||
Logger.LogInfo ("Environment", "Git " + Sparkles.Git.GitCommand.GitVersion);
|
Logger.LogInfo ("Environment", "Git " + Sparkles.Git.GitCommand.GitVersion);
|
||||||
|
|
||||||
// TODO: Nice OS version names for Linux (Fedora 24, Ubuntu 16.04, etc.)
|
|
||||||
if (InstallationInfo.OperatingSystem == OS.Mac)
|
if (InstallationInfo.OperatingSystem == OS.Mac)
|
||||||
Logger.LogInfo ("Environment", InstallationInfo.MacOSVersion ());
|
Logger.LogInfo ("Environment", InstallationInfo.MacOSVersion ());
|
||||||
else
|
else
|
||||||
|
@ -641,8 +640,7 @@ namespace SparkleShare {
|
||||||
{
|
{
|
||||||
this.fetcher.EnableFetchedRepoCrypto (password);
|
this.fetcher.EnableFetchedRepoCrypto (password);
|
||||||
FinishFetcher (StorageType.Encrypted);
|
FinishFetcher (StorageType.Encrypted);
|
||||||
} // TODO: make this the main method. password optional. need to know storage type before Complete to allow crypto in lfs
|
}
|
||||||
// Make sure IsCryptoPasswordCorrect works with SparkleShare.txt checkout and LFS
|
|
||||||
|
|
||||||
|
|
||||||
public void FinishFetcher (StorageType selected_storage_type)
|
public void FinishFetcher (StorageType selected_storage_type)
|
||||||
|
|
Loading…
Reference in a new issue