diff --git a/README.md b/README.md index 7e4db671..54e49525 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,8 @@ This software creates a folder `$"{System.Environment.SpecialFolder.ApplicationD | macOS | `${HOME}/Library/Application Support/SourceGit` | > [!TIP] -> You can open this data storage directory from the main menu. +> * You can open this data storage directory from the main menu `Open Data Storage Directory`. +> * You can create a `data` folder next to the `SourceGit` executable to force this app to store data (user settings, downloaded avatars and crash logs) into it (Portable-Mode). Only works on Windows. For **Windows** users: @@ -81,7 +82,6 @@ For **Windows** users: scoop install sourcegit ``` * Pre-built binaries can be found in [Releases](https://github.com/sourcegit-scm/sourcegit/releases/latest) -* You can run `dotnet publish -c Release -r win-x64 -p:EnablePortable=true -o $YOUR_PUBLISH_DIR .\src\SourceGit.csproj` to build a portable version. For **macOS** users: diff --git a/src/Native/OS.cs b/src/Native/OS.cs index ca56cdac..c8c9e92d 100644 --- a/src/Native/OS.cs +++ b/src/Native/OS.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; -#if ENABLE_PORTABLE using System.Diagnostics; -#endif using System.IO; using Avalonia; @@ -58,16 +56,17 @@ namespace SourceGit.Native public static void SetupDataDir() { -#if ENABLE_PORTABLE if (OperatingSystem.IsWindows()) { var execFile = Process.GetCurrentProcess().MainModule!.FileName; - DataDir = Path.Combine(Path.GetDirectoryName(execFile), "data"); - if (!Directory.Exists(DataDir)) - Directory.CreateDirectory(DataDir); - return; + var portableDir = Path.Combine(Path.GetDirectoryName(execFile), "data"); + if (Directory.Exists(portableDir)) + { + DataDir = portableDir; + return; + } } -#endif + var osAppDataDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData); if (string.IsNullOrEmpty(osAppDataDir)) DataDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".sourcegit"); diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj index 8e8c2b3f..497a518f 100644 --- a/src/SourceGit.csproj +++ b/src/SourceGit.csproj @@ -30,10 +30,6 @@ $(DefineConstants);DISABLE_UPDATE_DETECTION - - $(DefineConstants);ENABLE_PORTABLE - -