mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-02-21 02:55:37 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(config): do not resolve URL when download fails

Browse source
This commit is contained in:
L. Yeung 2022-04-29 20:28:29 +08:00 committed by Jan De Dobbeleer
parent 9a995ed0c2
commit 4c0db9e66e
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/docs/installation/windows.mdx
View file

@ -144,7 +144,7 @@ when setting the prompt using the `--config` flag.
</TabItem> </TabItem>
<TabItem value="manual"> <TabItem value="manual">
You can find the themes winget installs inside the `$env:POSH_THEMES_PATH` folder. You can find the themes inside the `$env:POSH_THEMES_PATH` folder.
To use `jandedobbeleer.omp.json` for example, you can refer to it using `$env:POSH_THEMES_PATH\jandedobbeleer.omp.json` To use `jandedobbeleer.omp.json` for example, you can refer to it using `$env:POSH_THEMES_PATH\jandedobbeleer.omp.json`
when setting the prompt using the `--config` flag. when setting the prompt using the `--config` flag.

2
src/engine/config.go
View file

@ -281,7 +281,7 @@ func defaultConfig() *Config {
BackgroundTemplates: []string{ BackgroundTemplates: []string{
"{{ if gt .Code 0 }}#f1184c{{ end }}", "{{ if gt .Code 0 }}#f1184c{{ end }}",
}, },
Template: " \uE23A", Template: " \uE23A ",
Properties: properties.Map{ Properties: properties.Map{
properties.AlwaysEnabled: true, properties.AlwaysEnabled: true,
}, },

8
src/environment/shell.go
View file

@ -234,13 +234,15 @@ func (env *ShellEnvironment) resolveConfigPath() {
env.CmdFlags.Config = fmt.Sprintf("https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/v%s/themes/default.omp.json", env.Version) env.CmdFlags.Config = fmt.Sprintf("https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/v%s/themes/default.omp.json", env.Version)
} }
if strings.HasPrefix(env.CmdFlags.Config, "https://") { if strings.HasPrefix(env.CmdFlags.Config, "https://") {
if err := env.downloadConfig(env.CmdFlags.Config); err == nil { if err := env.downloadConfig(env.CmdFlags.Config); err != nil {
// make it use default config when download fails
env.CmdFlags.Config = ""
return return
} }
} }
// Cygwin path always needs the full path as we're on Windows but not really. // Cygwin path always needs the full path as we're on Windows but not really.
// Doing filepath actions will convert it to a Windows path and break the init script. // Doing filepath actions will convert it to a Windows path and break the init script.
if env.Platform() == WindowsPlatform && env.Shell() == "constants.BASH" { if env.Platform() == WindowsPlatform && env.Shell() == "bash" {
return return
} }
configFile := env.CmdFlags.Config configFile := env.CmdFlags.Config
@ -569,7 +571,7 @@ func (env *ShellEnvironment) Shell() string {
return Unknown return Unknown
} }
// Cache the shell value to speed things up. // Cache the shell value to speed things up.
env.CmdFlags.Shell = strings.Trim(strings.Replace(name, ".exe", "", 1), " ") env.CmdFlags.Shell = strings.Trim(strings.TrimSuffix(name, ".exe"), " ")
return env.CmdFlags.Shell return env.CmdFlags.Shell
} }