From 05f802ebdc16520c8778c3770a999bdaa7d00c60 Mon Sep 17 00:00:00 2001
From: Ilan Cosman <ilancosman@gmail.com>
Date: Sat, 18 Jul 2020 15:27:17 -0700
Subject: [PATCH] Prevent errors after install/finish configure

---
 tide_theme/configure/choices/all/finish.fish | 12 +++---------
 tools/tide_actual_install.fish               | 19 ++++++++-----------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/tide_theme/configure/choices/all/finish.fish b/tide_theme/configure/choices/all/finish.fish
index 1b8c7f5..ae77866 100644
--- a/tide_theme/configure/choices/all/finish.fish
+++ b/tide_theme/configure/choices/all/finish.fish
@@ -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
diff --git a/tools/tide_actual_install.fish b/tools/tide_actual_install.fish
index 4c50af2..5b76dfe 100644
--- a/tools/tide_actual_install.fish
+++ b/tools/tide_actual_install.fish
@@ -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