csimonis/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Releases Activity

style: format .gitignore and script files consistently

Browse Source
This commit is contained in:
Constantin Simonis
2025-07-07 15:59:06 +02:00
parent ad853c7f68
commit 4c35fedb36
5 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/install
View File

@ -40,8 +40,14 @@ if [ -f "$HOME/.zshrc" ] && [ ! -L "$HOME/.zshrc" ]; then
fi fi
mkdir -p "$HOME/.ssh" mkdir -p "$HOME/.ssh"
echo "Include $HOME/.config/ssh/*" >> "$HOME/.ssh/config" if ! grep -Fxq "Include ~/.config/ssh/*" "$HOME/.ssh/config" 2>/dev/null; then
echo "Include ~/.config/ssh/*" >> "$HOME/.ssh/config"
fi
ln -s $DOTFILES_INSTALL_DIR/scripts/post-merge .git/hooks/post-merge if [ -f "$DOTFILES_INSTALL_DIR/.git/hooks/post-merge" ]; then
rm "$DOTFILES_INSTALL_DIR/.git/hooks/post-merge"
fi
./setup ln -s $DOTFILES_INSTALL_DIR/scripts/post-merge .git/hooks/post-merge
./scripts/setup

2
scripts/post-merge
View File

@ -1,3 +1,3 @@
#!/usr/bin/env bash #!/usr/bin/env bash
./setup ./scripts/setup

9
scripts/setup
View File

@ -10,15 +10,6 @@ git submodule update --init --recursive
find . -type d -name '.git*' -prune -o -type f -print0 | xargs -0 dos2unix > /dev/null 2>&1 find . -type d -name '.git*' -prune -o -type f -print0 | xargs -0 dos2unix > /dev/null 2>&1
echo "[+] Creating Gitconfigs..."
(
for config in $PWD/.gitconfig.d/*.gitconfig; do
echo "[include]"
echo " path = $config"
done;
) > "$HOME/.gitconfig"
./scripts/gitconfig ./scripts/gitconfig
echo echo