Evaluate OMF_PATH at init time to fix #136 (#348)

228ef9aa · Stephen M. Coakley · Derek Willian Stavis · 6c373d89 · 228ef9aa · 228ef9aa
Commit 228ef9aa authored Jun 15, 2016 by Stephen M. Coakley Committed by Derek Willian Stavis Jun 15, 2016
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

bin/install bin/install +1 -1

templates/config.fish templates/config.fish +3 -1

No files found.
--- a/bin/install
+++ b/bin/install
@@ -109,7 +109,7 @@ function install_omf
  report progress "Adding startup code to fish config file..."

  set template "templates/config.fish"
-  set replacements "s|{{OMF_PATH}}|$OMF_PATH|;s|{{OMF_CONFIG}}|$OMF_CONFIG|"
+  set replacements "s|{{OMF_CONFIG}}|$OMF_CONFIG|"

  if test "$OMF_CONFIG" != "$XDG_CONFIG_HOME/omf"
    set replacements "$replacements;s|#set|set|"

--- a/templates/config.fish
+++ b/templates/config.fish
 # Path to Oh My Fish install.
-set -gx OMF_PATH "{{OMF_PATH}}"
+set -q XDG_DATA_HOME
+  and set -gx OMF_PATH "$XDG_DATA_HOME/omf"
+  or set -gx OMF_PATH "$HOME/.local/share/omf"

 # Customize Oh My Fish configuration path.
 #set -gx OMF_CONFIG "{{OMF_CONFIG}}"