mirror of
https://github.com/danbee/mac-setup
synced 2025-03-04 08:39:10 +00:00
Merge branch 'master' of git@github.com:danbee/mac-setup.git
This commit is contained in:
commit
a80f0c3e6f
@ -7,5 +7,5 @@ Script and Brewfile to setup a Mac for development.
|
||||
1. Run the setup script with:
|
||||
|
||||
```sh
|
||||
curl -s https://raw.githubusercontent.com/danbee/mac-setup/master/setup.sh | sh`
|
||||
$ sh <( curl -s https://raw.githubusercontent.com/danbee/mac-setup/master/setup.sh )
|
||||
```
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
#!/bin/sh
|
||||
|
||||
cd "$HOME"
|
||||
|
||||
if [ $SHELL != $(which zsh) ]; then
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env bash
|
||||
#!/bin/sh
|
||||
|
||||
# Close any open System Preferences panes, to prevent them from overriding
|
||||
# settings we’re about to change
|
||||
|
||||
9
lib/shell.sh
Executable file
9
lib/shell.sh
Executable file
@ -0,0 +1,9 @@
|
||||
#!/bin/sh
|
||||
|
||||
SHELL_PATH=$(command -v zsh)
|
||||
|
||||
if ! grep "$SHELL_PATH" /etc/shells > /dev/null 2>&1 ; then
|
||||
sudo sh -c "echo $SHELL_PATH >> /etc/shells"
|
||||
fi
|
||||
|
||||
sudo chsh -s "$SHELL_PATH" "$USER"
|
||||
8
setup.sh
8
setup.sh
@ -1,4 +1,5 @@
|
||||
#!/bin/sh
|
||||
|
||||
MAC_SETUP_DIR="$HOME/mac-setup"
|
||||
|
||||
BOLD="\033[1m"
|
||||
@ -11,6 +12,9 @@ step() {
|
||||
echo "${YELLOW}❯❯❯ ${WHITE}${BOLD}$1${NC} ${YELLOW}❮❮❮${NC}"
|
||||
}
|
||||
|
||||
# Ask for the administrator password upfront
|
||||
sudo -v
|
||||
|
||||
# Generate an SSH key if one does not already exist
|
||||
if [ ! -f "$HOME/.ssh/id_ed25519.pub" ]; then
|
||||
step "Generating SSH key"
|
||||
@ -53,6 +57,10 @@ brew bundle --file="$MAC_SETUP_DIR/Brewfile"
|
||||
step "Installing dotfiles"
|
||||
"$MAC_SETUP_DIR/lib/dotfiles.sh"
|
||||
|
||||
# Change the shell
|
||||
step "Changing shell to zsh"
|
||||
"$MAC_SETUP_DIR/lib/shell.sh"
|
||||
|
||||
# Setup git author
|
||||
step "Set git author"
|
||||
"$MAC_SETUP_DIR/lib/git_author.sh"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user