Skip to content

fix: treat .jar as portable and treat portable distributions as portable regardless of the OS #200

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

Merged
SpoilerRules merged 1 commit into from
Feb 18, 2026
Merged

fix: treat .jar as portable and treat portable distributions as portable regardless of the OS #200

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
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/spoiligaming/explorer/StartupAppDataMigration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ internal object StartupAppDataMigration {
)

fun migrateBeforeLogging(): File {
if (AppStoragePaths.isPortableWindows) {
if (AppStoragePaths.isPortableInstall) {
return AppStoragePaths.logsDir
}

Expand Down
11 changes: 7 additions & 4 deletions settings/src/main/kotlin/com/spoiligaming/explorer/settings/util/AppStoragePaths.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ object AppStoragePaths {
private val osName = System.getProperty("os.name")?.lowercase().orEmpty()
private val isMac = osName.contains("mac")
private val isWindows = osName.contains("win")
val isPortableWindows = isWindows && BuildConfig.DISTRIBUTION.contains("portable", ignoreCase = true)

private val isPortableDistribution = BuildConfig.DISTRIBUTION.contains("portable", ignoreCase = true)
private val isJarDistribution = BuildConfig.DISTRIBUTION.contains("jar", ignoreCase = true)
val isPortableInstall = isPortableDistribution || isJarDistribution

val preferredAppDirName =
if (isWindows || isMac) {
Expand Down Expand Up @@ -104,9 +107,9 @@ object AppStoragePaths {

val platformLogsDir = platformLogsRootDir.resolve(LOGS_DIR_NAME)

val settingsDir = if (isPortableWindows) legacyConfigDir else platformSettingsDir
val settingsDir = if (isPortableInstall) legacyConfigDir else platformSettingsDir

val firstRunConfigDir = if (isPortableWindows) legacyConfigDir else platformConfigRootDir
val firstRunConfigDir = if (isPortableInstall) legacyConfigDir else platformConfigRootDir

val logsDir = if (isPortableWindows) legacyLogsDir else platformLogsDir
val logsDir = if (isPortableInstall) legacyLogsDir else platformLogsDir
}
Loading