Skip to content

Commit

Permalink
Fixed some linting/compat issues
Browse files Browse the repository at this point in the history
  • Loading branch information
webpro committed Jul 1, 2015
1 parent fcc821f commit ee698c5
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
7 changes: 4 additions & 3 deletions bin/dotfiles
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#!/bin/sh
#!/usr/bin/env bash

BIN_NAME=$(basename $0)
BIN_NAME=$(basename "$0")
COMMAND_NAME=$1
SUB_COMMAND_NAME=$2

sub_help () {
echo "Usage: $BIN_NAME <command>\n"
echo "Usage: $BIN_NAME <command>"
echo
echo "Commands:"
echo " help This help message"
echo " edit Open dotfiles in default editor ($EDITOR) and Git GUI ($GIT_GUI)"
Expand Down
2 changes: 2 additions & 0 deletions bin/plistbuddy
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env bash

PLIST=$1
ACTION=$2
KEY="$3"
Expand Down
2 changes: 1 addition & 1 deletion install/osx.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/usr/bin/env bash

# Install Homebrew & brew-cask

Expand Down
6 changes: 3 additions & 3 deletions osx/dock.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/bin/sh

dockutil --no-restart --remove all
dockutil --no-restart --add "~/Applications/Google Chrome.app"
dockutil --no-restart --add "~/Applications/Firefox.app"
dockutil --no-restart --add "$HOME/Applications/Google Chrome.app"
dockutil --no-restart --add "$HOME/Applications/Firefox.app"
dockutil --no-restart --add "/Applications/Safari.app"
dockutil --no-restart --add "/Applications/Mail.app"
dockutil --no-restart --add "/Applications/Calendar.app"
dockutil --no-restart --add "/Applications/Utilities/Terminal.app"
dockutil --no-restart --add "/Applications/System Preferences.app"
dockutil --no-restart --add "/Applications/Utilities/Console.app"
dockutil --no-restart --add "~/Applications/Spotify.app"
dockutil --no-restart --add "$HOME/Applications/Spotify.app"

killall Dock
8 changes: 4 additions & 4 deletions runcom/.bash_profile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fi
if [ "$(uname -s)" = "Darwin" ]; then
OS="OSX"
else
OS=`uname -s`
OS=$(uname -s)
fi

# Resolve DOTFILES_DIR (assuming ~/.dotfiles on distros without readlink and/or $BASH_SOURCE/$0)
Expand All @@ -31,7 +31,7 @@ fi

if [[ -n $CURRENT_SCRIPT && -x "$READLINK" ]]; then
SCRIPT_PATH=$($READLINK -f "$CURRENT_SCRIPT")
DOTFILES_DIR=$(dirname $(dirname "$SCRIPT_PATH"))
DOTFILES_DIR=$(dirname "$(dirname "$SCRIPT_PATH")")
elif [ -d "$HOME/.dotfiles" ]; then
DOTFILES_DIR="$HOME/.dotfiles"
else
Expand All @@ -45,7 +45,7 @@ for DOTFILE in "$DOTFILES_DIR"/system/.{function,path,env,alias,completion,grep,
[ -f "$DOTFILE" ] && . "$DOTFILE"
done

if [ $OS = "OSX" ]; then
if [ "$OS" = "OSX" ]; then
for DOTFILE in "$DOTFILES_DIR"/system/.{env,alias,function}.osx; do
[ -f "$DOTFILE" ] && . "$DOTFILE"
done
Expand All @@ -65,7 +65,7 @@ fi

# Set LSCOLORS

eval $(dircolors $DOTFILES_DIR/system/.dir_colors)
eval "$(dircolors "$DOTFILES_DIR"/system/.dir_colors)"

# Hook for extra/custom stuff

Expand Down

0 comments on commit ee698c5

Please sign in to comment.