vleeuwenmenno/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Update symlinks in update.sh and functions.sh

Browse Source 
feat: symlinks in config.yaml
fix: vscode tracking bullshit
This commit is contained in:
Menno van Leeuwen
2024-08-27 15:27:32 +02:00
parent 7fa255179e
commit f532a924fb
6 changed files with 94 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
bin/actions/update.sh
View File

@ -54,26 +54,43 @@ groups() {
ensure_user_groups
}
ensure_symlink() {
source=$(cat $HOME/dotfiles/config/config.yaml | shyaml get-values config.symlinks.$1.source) &>/dev/null
target=$(cat $HOME/dotfiles/config/config.yaml | shyaml get-value config.symlinks.$1.target) &>/dev/null
# Based on the OS_TYPE, get the correct source
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
source=$(cat $HOME/dotfiles/config/config.yaml | shyaml get-value config.symlinks.$1.sources.linux) &>/dev/null
elif [[ "$OSTYPE" == "darwin"* ]]; then
source=$(cat $HOME/dotfiles/config/config.yaml | shyaml get-value config.symlinks.$1.sources.macos) &>/dev/null
fi
# Try adding a default source if the OS_TYPE specific source is empty
if [ -z "$source" ]; then
source=$(cat $HOME/dotfiles/config/config.yaml | shyaml get-value config.symlinks.$1.source) &>/dev/null
fi
# If this is still empty, we can't continue and should throw up an error
if [ -z "$source" ]; then
printfe "%s\n" "red" " - No valid source defined for $1"
return
fi
check_or_make_symlink $source $target
}
symlinks() {
####################################################################################################
# Update symlinks
####################################################################################################
printfe "%s\n" "cyan" "Updating config symlinks..."
check_or_make_symlink ~/.zshrc ~/dotfiles/.zshrc
check_or_make_symlink ~/.config/Code/User/settings.json ~/dotfiles/vscode/settings.json
check_or_make_symlink ~/.config/starship.toml ~/dotfiles/config/starship.toml
if [[ "$OSTYPE" == "darwin"* ]]; then
check_or_make_symlink ~/.gitconfig ~/dotfiles/config/gitconfig.macos
else
check_or_make_symlink ~/.gitconfig ~/dotfiles/config/gitconfig.linux
fi
check_or_make_symlink ~/.ssh/config ~/dotfiles/config/ssh/config
check_or_make_symlink ~/.ssh/config.d ~/dotfiles/config/ssh/config.d
check_or_make_symlink ~/.config/alacritty/alacritty.toml ~/dotfiles/config/alacritty.toml
# Load symlinks from config file
symlinks=($(cat $HOME/dotfiles/config/config.yaml | shyaml keys config.symlinks))
printfe "%s\n" "cyan" "Updating symlinks..."
for symlink in $symlinks; do
ensure_symlink $symlink
done
}
sys_packages() {

16
bin/helpers/functions.sh
View File

@ -164,7 +164,8 @@ check_or_make_symlink() {
fi
mkdir -p $(dirname $1)
ln -s $2 $1
printfe "%s\n" "green" " - Created symlink $1 -> $2"
printfe "%s\n" "green" " - Created symlink $2 -> $1"
return
fi
# Confirm the symlink that already exists point to the correct location
@ -177,9 +178,20 @@ check_or_make_symlink() {
rm $1
mkdir -p $(dirname $1)
ln -s $2 $1
printfe "%s\n" "green" " Created symlink $1 -> $2"
printfe "%s\n" "green" " Created symlink $2 -> $1"
return
fi
fi
if [ ! -L $1 ]; then
printfe "%s\n" "red" " - Failed to create symlink $2 -> $1"
return
fi
printfe "%s" "green" " - OK: "
printfe "%-30s" "blue" "$1"
printfe "%s" "cyan" " -> "
printfe "%-30s\n" "blue" "$2"
}
clear_line() {