fix: Hack clearing after intermediate source-ing

Author: mloskot

install.sh

@@ -49,12 +49,20 @@ else
   echowrn "Skipping terminal applications..."
 fi
 
+# Restore environment after previous source-ing to avoid confusing logs
+source ~/.dotfiles/err.sh "${BASH_SOURCE[0]}"
+source ~/.dotfiles/log.sh "${BASH_SOURCE[0]}"
+
 if [[ $arg_desktop -gt 0 ]]; then
   source ~/.dotfiles/install/desktop.sh
 else
   echowrn "Skipping desktop applications..."
 fi
 
+# Restore environment after previous source-ing to avoid confusing logs
+source ~/.dotfiles/err.sh "${BASH_SOURCE[0]}"
+source ~/.dotfiles/log.sh "${BASH_SOURCE[0]}"
+
 if [[ "$XDG_CURRENT_DESKTOP" == *"GNOME"* ]]; then
   echolog "Restoring idle and lock settings"
   gsettings set org.gnome.desktop.session idle-delay "${idle_delay}"

install/desktop.sh

@@ -32,6 +32,10 @@ do
   fi
 done
 
+# Restore environment after previous source-ing to avoid confusing logs
+source ~/.dotfiles/err.sh "${BASH_SOURCE[0]}"
+source ~/.dotfiles/log.sh "${BASH_SOURCE[0]}"
+
 if [[ -z "${DOTFILES_INSTALL_SH}" ]]; then
   echolog "Successful installers: ${DOTFILES_INSTALL_SUCCESS}"
   echolog "Failed installers: ${DOTFILES_INSTALL_FAILURE}"

install/terminal.sh

@@ -33,6 +33,10 @@ do
   fi
 done
 
+# Restore environment after previous source-ing to avoid confusing logs
+source ~/.dotfiles/err.sh "${BASH_SOURCE[0]}"
+source ~/.dotfiles/log.sh "${BASH_SOURCE[0]}"
+
 if [[ -z "${DOTFILES_INSTALL_SH}" ]]; then
   echolog "Successful installers: ${DOTFILES_INSTALL_SUCCESS}"
   echolog "Failed installers: ${DOTFILES_INSTALL_FAILURE}"