Skip to content

Commit bc7170d

Browse files
authored
🗄 chore: Move git package (#73)
See #40.
2 parents 4c2a877 + 8c741a8 commit bc7170d

6 files changed

Lines changed: 26 additions & 5 deletions

File tree

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ ubuntu: ubuntu-core
1010
core: $(OS)-core
1111
clean: $(OS)-clean
1212
cli-network: $(OS)-cli-network
13+
git: $(OS)-git
1314
nano: $(OS)-nano
1415
stow: $(OS)-stow
1516
zsh: $(OS)-zsh
1617

17-
git: $(OS)-git
18-
ln -sf '.dotfiles/pkg/git/.gitconfig' "${HOME}"
1918
micro: $(OS)-micro
2019
stow --no-folding --dir 'pkg/micro' --target "${HOME}" 'stow'
2120
ansible: stow

makefiles/macos.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ macos-duti: macos-brew
105105
# This is a full suite of git plugins and configurations
106106
# Most other target that requires git don't need this
107107
macos-git: macos-brew
108-
brew bundle --file pkg/git/git.Brewfile
108+
run "pkg/git/macos-git.sh"
109109

110110
macos-micro: macos-brew
111111
brew install micro

makefiles/ubuntu.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ ubuntu-dropbox: ubuntu-essential
3636
# CLIs #
3737
###############################################################################
3838

39-
ubuntu-git: ubuntu-stow
40-
xargs sudo apt-get install -y < pkg/git/git.Aptfile
39+
ubuntu-git:
40+
run "pkg/git/debian-git.sh"
4141

4242
ubuntu-micro: ubuntu-stow
4343
run "pkg/micro/debian-micro.sh"

pkg/git/debian-git.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
set -euo pipefail
3+
4+
# Install git and miscellaneous tools
5+
sudo apt-get update
6+
xargs sudo apt-get install -y < pkg/git/git.Aptfile
7+
8+
# Run global setup script
9+
bash pkg/git/git.sh

pkg/git/git.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
# Create a symbolic link for the global git configuration file
5+
ln -sf '.dotfiles/pkg/git/.gitconfig' "${HOME}"

pkg/git/macos-git.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
set -euo pipefail
3+
4+
# Install git and miscellaneous tools
5+
brew bundle --file pkg/git/git.Brewfile
6+
7+
# Run global setup script
8+
bash pkg/git/git.sh

0 commit comments

Comments
 (0)