diff --git a/Makefile b/Makefile index f7ac0c8..f4cbc5e 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,7 @@ snap: @./install -c config/snap.conf.yml --plugin-dir dotbot-snap macos: ## Run macos script + @./mac_bootstrap.sh @./macos/init_mac.sh brew: ## Install brew & cask packages diff --git a/install.sh b/install.sh new file mode 100755 index 0000000..b034a4e --- /dev/null +++ b/install.sh @@ -0,0 +1,22 @@ +#!/bin/bash - +#=============================================================================== +# +# FILE: install.sh +# +# USAGE: ./install.sh +# +# DESCRIPTION: +# +# OPTIONS: --- +# REQUIREMENTS: --- +# BUGS: --- +# NOTES: --- +# AUTHOR: YOUR NAME (), +# ORGANIZATION: +# CREATED: 10/21/2022 03:56:45 PM +# REVISION: --- +#=============================================================================== + +set -o nounset # Treat unset variables as an error + +make bootstrap diff --git a/bootstrap.sh b/mac_bootstrap.sh similarity index 90% rename from bootstrap.sh rename to mac_bootstrap.sh index 4e80748..97d7046 100644 --- a/bootstrap.sh +++ b/mac_bootstrap.sh @@ -20,10 +20,10 @@ brew bundle set -e echo "Setup workspace" -mkdir -p ~/projects +mkdir -p ~/Git/ echo "Setup Git" -ln -s ./git/work.gitconfig ~/projects/.gitconfig +ln -s ./git/work.gitconfig ~/Git/.gitconfig if [ -f $HOME/.gitconfig ]; then cat $HOME/.gitconfig mv $HOME/.gitconfig $HOME/.gitconfig.bak @@ -49,5 +49,3 @@ echo "Link editors" mkdir -p ~/Applications/ sudo ln -s /Applications/Visual\ Studio\ Code.app/Contents/Resources/app/bin/code /usr/local/bin/code -echo "Setup macOS defaults" -bash etc/init_mac.sh