Prevent errors after install/finish configure

This commit is contained in:
Ilan Cosman 2020-07-18 15:27:17 -07:00
parent 7a3dabbf26
commit 05f802ebdc
2 changed files with 11 additions and 20 deletions

View File

@ -17,17 +17,11 @@ function finish
cat "$_tide_dir/configure/fish_prompt.fish" >"$__fish_config_dir/functions/fish_prompt.fish"
for var in $_tide_var_list
set -e $var
end
set _tide_var_list
for fakeVar in $fake_tide_var_list
set -l normalVar (string replace 'fake_' '' $fakeVar)
for normalVar in (string replace 'fake_' '' $fake_tide_var_list)
set fakeVar fake_$normalVar
set -U $normalVar $$fakeVar
set -a _tide_var_list $normalVar
set -e $fakeVar
end
set _tide_var_list $fake_tide_var_list
source "$__fish_config_dir/conf.d/_tide_Ω_init.fish" # Reload important startup variables
end

View File

@ -30,21 +30,18 @@ function tide_actual_install
# --------------------Set Defaults--------------------
_set_immutables
cat "$_tide_dir/configure/fish_prompt.fish" >"$__fish_config_dir/functions/fish_prompt.fish"
set -U _tide_var_list
source "$_tide_dir/configure/choices/all/style.fish"
_load_config 'lean'
for fakeVar in $fake_tide_var_list
set -l normalVar (string replace 'fake_' '' $fakeVar)
set -U $normalVar $$fakeVar
set -a _tide_var_list $normalVar
set -e $fakeVar
end
cat "$_tide_dir/configure/fish_prompt.fish" >"$__fish_config_dir/functions/fish_prompt.fish"
source "$__fish_config_dir/conf.d/_tide_Ω_init.fish"
for normalVar in (string replace 'fake_' '' $fake_tide_var_list)
set fakeVar fake_$normalVar
set -U $normalVar $$fakeVar
end
set _tide_var_list $fake_tide_var_list
source "$__fish_config_dir/conf.d/_tide_Ω_init.fish" # Reload important startup variables
# -----------------------Finish-----------------------
for file in $_tide_file_list