diff --git a/03-bash_aliases.sh b/03-bash_aliases.sh index 4b81b8a..f65cab6 100644 --- a/03-bash_aliases.sh +++ b/03-bash_aliases.sh @@ -4,6 +4,8 @@ echo "Checking Custom Bash Aliases" ## Script Location # SCRIPTDIR=$(dirname $0) +BASHRCFILE="$HOME/.bashrc" + custom_bash_aliases_path="/etc/bash_aliases" custom_bash_aliases_git="https://git.deathbybandaid.net/deathbybandaid/bash_aliases.git" if [ ! -d "$custom_bash_aliases_path" ]; then @@ -13,4 +15,16 @@ else echo "* Updating Bash Aliases" git -C $custom_bash_aliases_path pull fi -source $HOME/.bashrc + +if [[ $(grep -L "$custom_bash_aliases_path" $BASHRCFILE) ]]; then + cat <> $BASHRCFILE + + # Aliases + if [ -f $custom_bash_aliases_path/main.aliases ]; then + . $custom_bash_aliases_path/main.aliases + fi +EOT +fi + +echo "* Importing Bash Aliases" +source $BASHRCFILE diff --git a/dependencies/grep.dep b/dependencies/grep.dep new file mode 100644 index 0000000..bdbac16 --- /dev/null +++ b/dependencies/grep.dep @@ -0,0 +1 @@ +grep