'install-dotfiles' script can now handle multiple env vars

vraravam · Dec 3, 2024 · 6300bc0 · 6300bc0
1 parent 390dd3a
commit 6300bc0
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 3 deletions.
diff --git a/TODO.txt b/TODO.txt
diff --git a/files/.config/bat/config → files/--XDG_CONFIG_HOME--/bat/config b/files/.config/bat/config → files/--XDG_CONFIG_HOME--/bat/config
diff --git a/files/.config/btop/btop.conf → files/--XDG_CONFIG_HOME--/btop/btop.conf b/files/.config/btop/btop.conf → files/--XDG_CONFIG_HOME--/btop/btop.conf
diff --git a/files/personal/template/profiles/.envrc → files/personal/--USER--/profiles/.envrc b/files/personal/template/profiles/.envrc → files/personal/--USER--/profiles/.envrc
diff --git a/...rsonal/template/profiles/custom.gitignore → ...rsonal/--USER--/profiles/custom.gitignore b/...rsonal/template/profiles/custom.gitignore → ...rsonal/--USER--/profiles/custom.gitignore
@@ -69,6 +69,7 @@ Thumbs.db
 /*Profile/**/Photos
 /*Profile/**/QuotaManager
 /*Profile/**/Reporting\ and\ NEL
+/*Profile/**/RunningChromeVersion
 /*Profile/**/safebrowsing-failedupdate
 /*Profile/**/Service\ Worker/**
 /*Profile/**/Session\ Storage

diff --git a/scripts/install-dotfiles.rb b/scripts/install-dotfiles.rb
@@ -21,10 +21,11 @@ def override_into_home_folder(file, dotfiles_dir_length)
   # git doesn't handle symlinks for its core configuration files, so files with 'custom.git' in their name have to be handled separately
   relative_file_name = file[dotfiles_dir_length..-1].gsub('custom.git', '.git')
 
-  # rename the profiles folder path to pick up the current user's name dynamically
-  relative_file_name.gsub!('/template/', "/#{`whoami`.chomp}/") if relative_file_name.match?(/\/template\//)
+  # process folder names having '--' in their name (strings within two pairs of '--' will refer to env variables)
+  relative_file_name = relative_file_name.split('--').map { |entry| ENV.has_key?(entry) ? ENV[entry] : entry }.join if relative_file_name.include?('--')
 
-  target_file_name = File.join(ENV['HOME'], relative_file_name)
+  # since some env var might already contain the full path from the root...
+  target_file_name = relative_file_name.start_with?(ENV['HOME']) ? relative_file_name : File.join(ENV['HOME'], relative_file_name)
 
   puts "Processing #{file.yellow} --> #{target_file_name.yellow}"