MangoPig/Dot-Zsh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MacOS fixes

Browse Source
This commit is contained in:
MangoPig
2026-06-01 00:34:54 +01:00
parent 52054493cc
commit 12b752892b
3 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Scripts/setup.sh
View File

@@ -44,7 +44,7 @@ sync_repo_managed_secret_file() {
}
backup_conflicting_home_files() {
local backup_dir backed_up_any=0 source_file filename target_file
local backup_dir backed_up_any=0 source_file filename target_file target_resolved source_resolved
backup_dir="$BACKUP_ROOT/$(date +%Y%m%d-%H%M%S)"
@@ -52,7 +52,19 @@ backup_conflicting_home_files() {
filename="$(basename "$source_file")"
target_file="$HOME/$filename"
if [ -e "$target_file" ] && [ ! -L "$target_file" ]; then
if [ -L "$target_file" ]; then
target_resolved="$(python3 -c 'import os,sys; print(os.path.realpath(sys.argv[1]))' "$target_file")"
source_resolved="$(python3 -c 'import os,sys; print(os.path.realpath(sys.argv[1]))' "$source_file")"
if [ "$target_resolved" = "$source_resolved" ]; then
continue
fi
mkdir -p "$backup_dir"
mv "$target_file" "$backup_dir/$filename"
echo "Backed up existing linked $target_file -> $backup_dir/$filename"
backed_up_any=1
elif [ -e "$target_file" ]; then
mkdir -p "$backup_dir"
mv "$target_file" "$backup_dir/$filename"
echo "Backed up existing $target_file -> $backup_dir/$filename"