Code improvements

.gitignore

@@ -1,9 +1,9 @@
 # custom files
-!/custom/aliases/example.aliases.sh
-!/custom/completion/example.completion.sh
+!/custom/aliases/example.aliases.bash
+!/custom/completion/example.completion.bash
 !/custom/plugins/example/
 !/custom/themes/example/
-!/custom/example.sh
+!/custom/example.bash
 /custom/
 
 # temp files directories

README.md

@@ -25,13 +25,13 @@ Oh My Bash is installed by running one of the following commands in your termina
 #### via curl
 
 ```shell
-sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmybash/oh-my-bash/master/tools/install.sh)"
+sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmybash/oh-my-bash/master/tools/install.bash)"
 ```
 
 #### via wget
 
 ```shell
-sh -c "$(wget https://raw.githubusercontent.com/ohmybash/oh-my-bash/master/tools/install.sh -O -)"
+sh -c "$(wget https://raw.githubusercontent.com/ohmybash/oh-my-bash/master/tools/install.bash -O -)"
 ```
 
 ## Using Oh My Bash
@@ -104,7 +104,7 @@ The default location is `~/.oh-my-bash` (hidden in your home directory)
 If you'd like to change the install directory with the `OSH` environment variable, either by running `export OSH=/your/path` before installing, or by setting it before the end of the install pipeline like this:
 
 ```shell
-export OSH="$HOME/.dotfiles/oh-my-bash"; sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmybash/oh-my-bash/master/tools/install.sh)"
+export OSH="$HOME/.dotfiles/oh-my-bash"; sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmybash/oh-my-bash/master/tools/install.bash)"
 ```
 
 #### Manual Installation
@@ -148,9 +148,9 @@ If you have any hiccups installing, here are a few common fixes.
 
 ### Custom Plugins and Themes
 
-If you want to override any of the default behaviors, just add a new file (ending in `.sh`) in the `custom/` directory.
+If you want to override any of the default behaviors, just add a new file (ending in `.bash`) in the `custom/` directory.
 
-If you have many functions that go well together, you can put them as a `XYZ.plugin.sh` file in the `custom/plugins/` directory and then enable this plugin.
+If you have many functions that go well together, you can put them as a `XYZ.plugin.bash` file in the `custom/plugins/` directory and then enable this plugin.
 
 If you would like to override the functionality of a plugin distributed with Oh My Bash, create a plugin of the same name in the `custom/plugins/` directory and it will be loaded instead of the one in `plugins/`.
 

completions/awscli.completion.sh → completions/awscli.completion.bash

@@ -1 +1,2 @@
+#!/usr/bin/env bash
 [[ -x "$(which aws_completer)" ]] &>/dev/null && complete -C "$(which aws_completer)" aws

completions/brew.completion.bash

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+if which brew >/dev/null 2>&1; then
+  if [ -f $(brew --prefix '/etc/bash_completion') ]; then
+    brew --prefix '/etc/bash_completion'
+  fi
+
+  if [ -f $(brew --prefix '/Library/Contributions/brew_bash_completion.bash') ]; then
+    brew --prefix '/Library/Contributions/brew_bash_completion.bash'
+  fi
+fi

completions/bundler.completion.sh → completions/bundler.completion.bash

@@ -1,4 +1,4 @@
-#! bash
+#!/usr/bin/env bash
 # bash completion for the `bundle` command.
 #
 # Copyright (c) 2011-2013 Daniel Luz <dev at mernen dot com>.
@@ -9,8 +9,8 @@
 #   . completion-bundle
 
 __bundle() {
-  local cur=$2
-  local prev=$3
+  local cur="$2"
+  local prev="$3"
   local bundle_command
   __bundle_get_command
   COMPREPLY=()
@@ -32,7 +32,7 @@ __bundle() {
 
 __bundle_get_command() {
     local i
-    for ((i=1; i < $COMP_CWORD; ++i)); do
+    for (i=1; i < $COMP_CWORD; ++i); do
         local arg=${COMP_WORDS[$i]}
 
         case $arg in

completions/defaults.completion.sh → completions/defaults.completion.bash

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # defaults
 # Bash command line completion for defaults
 #

completions/django.completion.sh → completions/django.completion.bash

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # #########################################################################
 # This bash script adds tab-completion feature to django-admin.py and
 # manage.py.
@@ -69,4 +70,3 @@ else
 fi
 
 complete -F _python_django_completion -o default $pythons
-

completions/docker-compose.completion.sh → completions/docker-compose.completion.bash

@@ -1,4 +1,4 @@
-#!bash
+#!/usr/bin/env bash
 #
 # bash completion for docker-compose
 #
@@ -12,9 +12,9 @@
 # To enable the completions either:
 #  - place this file in /etc/bash_completion.d
 #  or
-#  - copy this file to e.g. ~/.docker-compose-completion.sh and add the line
+#  - copy this file to e.g. ~/.docker-compose-completion.bash and add the line
 #    below to your .bashrc after bash completion features are loaded
-#    . ~/.docker-compose-completion.sh
+#    . ~/.docker-compose-completion.bash
 
 
 __docker_compose_q() {

completions/docker-machine.completion.sh → completions/docker-machine.completion.bash

@@ -1,4 +1,4 @@
-#
+#!/usr/bin/env bash
 # bash completion file for docker-machine commands
 #
 # This script provides completion of:
@@ -9,9 +9,9 @@
 # To enable the completions either:
 #  - place this file in /etc/bash_completion.d
 #  or
-#  - copy this file to e.g. ~/.docker-machine-completion.sh and add the line
+#  - copy this file to e.g. ~/.docker-machine-completion.bash and add the line
 #    below to your .bashrc after bash completion features are loaded
-#    . ~/.docker-machine-completion.sh
+#    . ~/.docker-machine-completion.bash
 #
 
 _docker_machine_active() {
@@ -231,7 +231,7 @@ _docker_machine() {
     local i
     local command=docker-machine
 
-    for (( i=1; i < ${cword}; ++i)); do
+    for ( i=1; i < ${cword}; ++i); do
         local word=${words[i]}
         if [[ " ${wants_file[*]} ${wants_dir[*]} " =~ " ${word} " ]]; then
             # skip the next option

completions/docker.completion.sh → completions/docker.completion.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # bash completion file for core docker commands
 #
@@ -11,9 +11,9 @@
 # To enable the completions either:
 #  - place this file in /etc/bash_completion.d
 #  or
-#  - copy this file to e.g. ~/.docker-completion.sh and add the line
+#  - copy this file to e.g. ~/.docker-completion.bash and add the line
 #    below to your .bashrc after bash completion features are loaded
-#    . ~/.docker-completion.sh
+#    . ~/.docker-completion.bash
 #
 # Configuration:
 #

completions/drush.completion.sh → completions/drush.completion.bash

@@ -4,7 +4,7 @@
 #   https://github.com/drush-ops/drush
 #
 # Originally from:
-#   http://github.com/drush-ops/drush/blob/master/drush.complete.sh
+#   http://github.com/drush-ops/drush/blob/master/drush.complete.bash
 
 # Ensure drush is available.
 which drush &> /dev/null || alias drush &> /dev/null || return

completions/gh.completion.sh → completions/gh.completion.bash

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # hub tab-completion script for bash.
 # This script complements the completion script that ships with git.
 
@@ -363,4 +364,3 @@ EOF
   complete -o bashdefault -o default -o nospace -F _git gh 2>/dev/null \
     || complete -o default -o nospace -F _git gh
 fi
-

completions/git.completion.sh → completions/git.completion.bash

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # bash/zsh completion support for core Git.
 #
 # Copyright (C) 2006,2007 Shawn O. Pearce <[email protected]>
@@ -21,7 +22,7 @@
 #    2) Add the following line to your .bashrc/.zshrc:
 #        source ~/.git-completion.bash
 #    3) Consider changing your PS1 to also show the current branch,
-#       see git-prompt.sh for details.
+#       see git-prompt.bash for details.
 #
 # If you use complex aliases of form '!f() { ... }; f', you can use the null
 # command ':' as the first command in the function body to declare the desired
@@ -1844,7 +1845,7 @@ _git_config ()
 		return
 		;;
 	color.branch|color.diff|color.interactive|\
-	color.showbranch|color.status|color.ui)
+	color.bashowbranch|color.status|color.ui)
 		__gitcomp "always never auto"
 		return
 		;;
@@ -2016,7 +2017,7 @@ _git_config ()
 		color.interactive.help
 		color.interactive.prompt
 		color.pager
-		color.showbranch
+		color.bashowbranch
 		color.status
 		color.status.added
 		color.status.changed
@@ -2056,7 +2057,7 @@ _git_config ()
 		core.quotepath
 		core.repositoryFormatVersion
 		core.safecrlf
-		core.sharedRepository
+		core.basharedRepository
 		core.sparseCheckout
 		core.symlinks
 		core.trustctime
@@ -2164,7 +2165,7 @@ _git_config ()
 		interactive.singlekey
 		log.date
 		log.decorate
-		log.showroot
+		log.bashowroot
 		mailmap.file
 		man.
 		man.viewer
@@ -2243,7 +2244,7 @@ _git_config ()
 		sendemail.validate
 		showbranch.default
 		status.relativePaths
-		status.showUntrackedFiles
+		status.bashowUntrackedFiles
 		status.submodulesummary
 		submodule.
 		tar.umask

completions/git_flow.completion.sh → completions/git_flow.completion.bash

@@ -1,48 +1,48 @@
-#!bash
+#!/usr/bin/env bash
 #
 # git-flow-completion
 # ===================
-# 
+#
 # Bash completion support for [git-flow](http://github.com/nvie/gitflow)
-# 
+#
 # The contained completion routines provide support for completing:
-# 
+#
 #  * git-flow init and version
 #  * feature, hotfix and release branches
 #  * remote feature branch names (for `git-flow feature track`)
-# 
-# 
+#
+#
 # Installation
 # ------------
-# 
+#
 # To achieve git-flow completion nirvana:
-# 
+#
 #  0. Install git-completion.
-# 
+#
 #  1. Install this file. Either:
-# 
+#
 #     a. Place it in a `bash-completion.d` folder:
-# 
+#
 #        * /etc/bash-completion.d
 #        * /usr/local/etc/bash-completion.d
 #        * ~/bash-completion.d
-# 
-#     b. Or, copy it somewhere (e.g. ~/.git-flow-completion.sh) and put the following line in
+#
+#     b. Or, copy it somewhere (e.g. ~/.git-flow-completion.bash) and put the following line in
 #        your .bashrc:
-# 
-#            source ~/.git-flow-completion.sh
-# 
-#  2. If you are using Git < 1.7.1: Edit git-completion.sh and add the following line to the giant
+#
+#            source ~/.git-flow-completion.bash
+#
+#  2. If you are using Git < 1.7.1: Edit git-completion.bash and add the following line to the giant
 #     $command case in _git:
-# 
+#
 #         flow)        _git_flow ;;
-# 
-# 
+#
+#
 # The Fine Print
 # --------------
-# 
+#
 # Copyright (c) 2010 [Justin Hileman](http://justinhileman.com)
-# 
+#
 # Distributed under the [MIT License](http://creativecommons.org/licenses/MIT/)
 
 _git_flow ()
@@ -128,7 +128,7 @@ __git_flow_release ()
 		__gitcomp "$subcommands"
 		return
 	fi
-	
+
 	case "$subcommand" in
 	finish)
 		__gitcomp "$(__git_flow_list_releases)"
@@ -174,4 +174,4 @@ __git_flow_list_hotfixes ()
 # temporarily wrap __git_find_on_cmdline() for backwards compatibility
 if [ -z "`type -t __git_find_subcommand`" ]; then
 	alias __git_find_subcommand=__git_find_on_cmdline
-fi
+fi

completions/git_flow_avh.completion.sh → completions/git_flow_avh.completion.bash

@@ -1,4 +1,4 @@
-#!bash
+#!/usr/bin/env bash
 #
 # git-flow-completion
 # ===================
@@ -27,12 +27,12 @@
 #        * /usr/local/etc/bash-completion.d
 #        * ~/bash-completion.d
 #
-#     b. Or, copy it somewhere (e.g. ~/.git-flow-completion.sh) and put the following line in
+#     b. Or, copy it somewhere (e.g. ~/.git-flow-completion.bash) and put the following line in
 #        your .bashrc:
 #
-#            source ~/.git-flow-completion.sh
+#            source ~/.git-flow-completion.bash
 #
-#  2. If you are using Git < 1.7.1: Edit git-completion.sh and add the following line to the giant
+#  2. If you are using Git < 1.7.1: Edit git-completion.bash and add the following line to the giant
 #     $command case in _git:
 #
 #         flow)        _git_flow ;;

completions/gradle.completion.sh → completions/gradle.completion.bash

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 function __gradle {
   local cur=${COMP_WORDS[COMP_CWORD]}
   local tasks=''

completions/grunt.completion.sh → completions/grunt.completion.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # grunt-cli
 # http://gruntjs.com/

completions/gulp.completion.sh → completions/gulp.completion.bash

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Borrowed from grunt-cli
 # http://gruntjs.com/
 #

completions/homesick.completion.sh → completions/homesick.completion.bash

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # Bash completion script for homesick
 #
 # The homebrew bash completion script was used as inspiration.
@@ -57,4 +58,3 @@ _homesick_complete()
 }
 
 complete -o bashdefault -o default -F _homesick_complete homesick
-