ringofstorms/dotfiles
ringofstorms/dotfiles
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://git.joshuabell.xyz:3032/dotfiles

Browse source
This commit is contained in:
RingOfStorms (Joshua Bell) 2025-02-08 11:33:48 -06:00
commit dc0fbcf679
5 changed files with 232 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

24
flake.nix
View file

@ -44,17 +44,23 @@
# Check if worktree already exists
if [ ! -d "$module_path" ]; then
echo "Adding worktree for $branch in $module_path"
git worktree add "$module_path" "$branch" 2>/dev/null
(git worktree add "$module_path" "$branch" 2>/dev/null) &
else
cd "$module_path"
git fetch origin "$branch" >/dev/null 2>&1
if ! git diff --quiet HEAD "origin/$branch"; then
echo "Updates available for $branch in $module_path"
fi
cd - >/dev/null
(
cd "$module_path"
git fetch origin "$branch" >/dev/null 2>&1
if ! git diff --quiet HEAD "origin/$branch"; then
echo "Updates available for $branch in $module_path"
git pull origin "$branch"
fi
cd - >/dev/null
) &
fi
done
# Wait for all background processes to finish
wait
# Check for and remove orphaned module directories
if [ -d "modules" ]; then
for dir in modules/*; do
@ -62,11 +68,13 @@
module_name="$(basename "$dir")"
if ! echo "$branches" | grep -q "^mod_$module_name$"; then
echo "Removing orphaned module directory: $dir"
git worktree remove --force "$dir"
(git worktree remove --force "$dir") &
fi
fi
done
fi
wait
'';
mod_status = pkgs.writeShellScriptBin "mod_status" ''
cwd=$(pwd)