install script updates

* fix logging and spacing issues
* update to use bash instead of zsh
This commit is contained in:
Nick Nisi
2016-03-29 14:57:34 -07:00
parent 342c4bcf20
commit 9e841588b6
6 changed files with 20 additions and 13 deletions

View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
echo "Installing dotfiles"
@@ -8,18 +8,14 @@ git submodule update --init --recursive
source install/link.sh
if [ "$(uname)" == "Darwin" ]; then
echo "Running on OSX"
echo -e "\n\nRunning on OSX"
echo "Brewing all the things"
source install/brew.sh
echo "Updating OSX settings"
source install/osx.sh
echo "Installing node (from nvm)"
source install/nvm.sh
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 ~/.dotfiles/nginx/nginx.conf /usr/local/etc/nginx/nginx.conf

View File

@@ -5,7 +5,8 @@ if test ! $(which brew); then
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
fi
echo "Installing homebrew packages..."
echo -e "\n\nInstalling homebrew packages..."
echo "=============================="
# cli tools
brew install ack

View File

@@ -1,4 +1,4 @@
#!/usr/bin/env zsh
#!/usr/bin/env bash
DOTFILES=$HOME/.dotfiles
@@ -39,12 +39,15 @@ done
# like to configure vim, so lets symlink ~/.vimrc and ~/.vim over to their
# neovim equivalent.
echo "\nCreating vim symlinks"
echo -e "\n\nCreating vim symlinks"
echo "=============================="
typeset -A vimfiles=(~/.vim $DOTFILES/config/nvim ~/.vimrc $DOTFILES/config/nvim/init.vim)
typeset -A vimfiles
vimfiles[~/.vim]=$DOTFILES/config/nvim
vimfiles[~/.vimrc]=$DOTFILES/config/nvim/init.vim
for file in "${(@k)vimfiles}"; do
for file in "${!vimfiles[@]}"; do
# for file in "${(@k)vimfiles}"; do
# echo "$file -> $vimfiles[$file]"
if [ -e ${file} ]; then
echo "${file} already exists... skipping"

View File

@@ -1,13 +1,14 @@
#!/bin/bash
echo -e "\n\nInstalling nginx"
echo "=============================="
######################################################
# nginx setup
######################################################
$DOTFILES=$HOME/.dotfiles
echo "Installing nginx"
# first, make sure apache is off
sudo launchctl unload -w /System/Library/LaunchDaemons/org.apache.httpd.plist

View File

@@ -1,5 +1,8 @@
#!/bin/sh
echo -e "\n\nInstalling Node (from nvm)"
echo "=============================="
# reload nvm into this environment
source $(brew --prefix nvm)/nvm.sh

View File

@@ -1,5 +1,8 @@
#!/usr/bin/env sh
echo -e "\n\nSetting OS X settings"
echo "=============================="
# echo "Finder: show all filename extensions"
defaults write NSGlobalDomain AppleShowAllExtensions -bool true