Merge remote-tracking branch 'refs/remotes/origin/main'

Author: paulirish

.aliases

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Easier navigation: .., ..., ~ and -
 alias ..="cd .."
 alias cd..="cd .."

.bash_profile

@@ -1,4 +1,4 @@
-
+# shellcheck shell=bash
 
 # PATH setup via ~/.paths
 setupPATH() {
@@ -13,15 +13,8 @@ setupPATH() {
 }
 setupPATH;
 
-# to help sublimelinter etc with finding my PATHS
-case $- in
-   *i*) source ~/.extra
-esac
-
 # Load our dotfiles like ~/.bash_prompt, etc…
-#   ~/.extra can be used for settings you don’t want to commit,
-#   Use it to configure your PATH, thus it being first in line.
-for file in ~/.{extra,bash_prompt,exports,aliases,functions}; do
+for file in ~/.{bash_prompt,exports,aliases,functions}; do
     [ -r "$file" ] && source "$file"
 done
 unset file

.bash_prompt

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # This prompt inspired by gf3, sindresorhus, alrra, and mathiasbynens.
 # but customized to me. <3
 

.bashrc

@@ -1,5 +1,4 @@
-
-
+# shellcheck shell=bash
 
 [ -n "$PS1" ] && source ~/.bash_profile
 

.exports

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # file is shared between bash and fish
 # todo: place these near the thematically related stuff. grouping as .exports is dumb.
 
@@ -42,3 +44,4 @@ export BAT_STYLE="changes,header-filename,header-filesize,snip,rule"
 
 export CLOUDSDK_PYTHON=/usr/bin/python3
 
+export GOPATH=$HOME/.go/

.functions

@@ -20,7 +20,7 @@ cdf() {  # short for cdfinder
 # Use `which` along with symlink resolving
 whichlink() {
 	# This dopeass conditional stolen from sheerun's dotfiles
-	$(type -p greadlink readlink | head -1) -f $(which $@)
+	$(type -p greadlink readlink | head -1) -f $(which "$@")
 }