From 27bf310ecf000a7bccb2aa399c8dbc804962f3c7 Mon Sep 17 00:00:00 2001 From: Nick Nisi Date: Wed, 17 Jun 2015 14:55:40 +0200 Subject: [PATCH] update install script * remove unused items * update to symlink the nginx configuration * install markdown from homebrew --- install.sh | 25 +++++++++++++++++-------- install/brew.sh | 6 +----- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/install.sh b/install.sh index 41295be..3ed9672 100755 --- a/install.sh +++ b/install.sh @@ -1,29 +1,38 @@ #!/bin/bash -echo "installing dotfiles" +echo "Installing dotfiles" -echo "initializing submodule(s)" +echo "Initializing submodule(s)" git submodule update --init --recursive source install/link.sh if [ "$(uname)" == "Darwin" ]; then - echo "running on OSX" + echo "Running on OSX" - echo "installing homebrew" + echo "Installing homebrew" ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" - echo "brewing all the things" + echo "Brewing all the things" source scripts/brew.sh - echo "updating OSX settings" + echo "Updating OSX settings" source scripts/osx.sh - echo "installing node (from nvm)" + echo "Installing node (from nvm)" nvm install stable nvm alias default stable + + echo "Configuring nginx" + # create a backup of the original nginx.conf + mv /usr/local/etc/nginx/nginx.conf /usr/local/etc/nginx/nginx.original + ln -s nginx/nginx.conf /usr/local/etc/nginx/nginx.conf + # symlink the code.dev from dotfiles + ln -s nginx/code.dev /usr/local/etc/nginx/sites-enabled/code.dev fi -echo "configuring zsh as default shell" +echo "Configuring zsh as default shell" chsh -s $(which zsh) + +echo "Done." diff --git a/install/brew.sh b/install/brew.sh index e52f501..5fc33bd 100755 --- a/install/brew.sh +++ b/install/brew.sh @@ -1,5 +1,4 @@ #!/bin/sh -# give me what I need, brew! # cli tools brew install ack @@ -20,7 +19,4 @@ brew install zsh brew install highlight brew install nvm brew install z - -# gitsh -brew tap thoughtbot/formulae -brew install gitsh +brew instal markdown