diff --git a/.bashrc b/.bashrc index 4b21948..88e88fa 100755 --- a/.bashrc +++ b/.bashrc @@ -63,8 +63,10 @@ export TERM="xterm-256color" export EDITOR=$(which vim) # Adding applications to path -if [[ -d ${HOME}/bin ]]; -then +if [[ -d ${HOME}/.dotfiles/bin/linux ]]; then + export PATH=$PATH:${HOME}/.dotfiles/bin/linux +fi +if [[ -d ${HOME}/bin ]]; then export PATH=$PATH:${HOME}/bin fi diff --git a/bin/linux/bat b/bin/linux/bat new file mode 120000 index 0000000..7c88428 --- /dev/null +++ b/bin/linux/bat @@ -0,0 +1 @@ +bat-0.18.2 \ No newline at end of file diff --git a/bin/linux/delta b/bin/linux/delta new file mode 120000 index 0000000..dbd4da3 --- /dev/null +++ b/bin/linux/delta @@ -0,0 +1 @@ +delta-0.14.0 \ No newline at end of file diff --git a/bin/linux/difft b/bin/linux/difft new file mode 120000 index 0000000..9006d32 --- /dev/null +++ b/bin/linux/difft @@ -0,0 +1 @@ +difft-0.38.0 \ No newline at end of file diff --git a/bin/linux/dive b/bin/linux/dive new file mode 120000 index 0000000..8ab4004 --- /dev/null +++ b/bin/linux/dive @@ -0,0 +1 @@ +dive-0.10.0 \ No newline at end of file diff --git a/bin/linux/exa b/bin/linux/exa new file mode 120000 index 0000000..63c7694 --- /dev/null +++ b/bin/linux/exa @@ -0,0 +1 @@ +exa-0.10.0 \ No newline at end of file diff --git a/scripts/git-safedel b/bin/linux/git-safedel similarity index 100% rename from scripts/git-safedel rename to bin/linux/git-safedel diff --git a/scripts/git-top b/bin/linux/git-top similarity index 100% rename from scripts/git-top rename to bin/linux/git-top diff --git a/bin/linux/jq b/bin/linux/jq new file mode 120000 index 0000000..f95b800 --- /dev/null +++ b/bin/linux/jq @@ -0,0 +1 @@ +jq-1.6 \ No newline at end of file diff --git a/bin/osx/bat-0.18.2 b/bin/osx/bat-0.18.2 deleted file mode 100755 index 90c8aa8..0000000 Binary files a/bin/osx/bat-0.18.2 and /dev/null differ diff --git a/bin/osx/exa-0.10.0 b/bin/osx/exa-0.10.0 deleted file mode 100755 index 82c967f..0000000 Binary files a/bin/osx/exa-0.10.0 and /dev/null differ diff --git a/bin/osx/jq-1.6 b/bin/osx/jq-1.6 deleted file mode 100755 index d363c8a..0000000 Binary files a/bin/osx/jq-1.6 and /dev/null differ diff --git a/install.sh b/install.sh index 5d7e93d..663cc7a 100755 --- a/install.sh +++ b/install.sh @@ -20,16 +20,6 @@ GIT_REPO_BASE="https://github.com/tgrosinger/dotfiles" GIT_REPO="${GIT_REPO_BASE}.git" REPO_TAR="${GIT_REPO_BASE}/archive/master.tar.gz" - -if [[ "${OSTYPE}" == "linux-gnu"* ]]; then - BIN_DIR="bin/linux" -elif [[ "${OSTYPE}" == "darwin"* ]]; then - BIN_DIR="bin/osx" -else - echo "Unknown OS type" - exit 1 -fi - ################################################################################ # Define functions ################################################################################ @@ -39,11 +29,6 @@ function linkFile() { ln -fns ${DOTFILES_DIR}/$1 $1; } -# Remove a file if it exists then create a symlink from the file in $HOME/bin to the one contained in ${DOTFILES_DIR} -function linkBin() { - ln -fns ${DOTFILES_DIR}/$1 $HOME/bin/$2; -} - # Create a directory named by first parameter. Delete directory first if it already exists. function createDirectory() { if [ -d $1 ]; then rm -rf $1; fi @@ -62,11 +47,6 @@ function performSetup() { echo "Moving to Home directory..." pushd ${home} > /dev/null - if [ ! -d bin ]; then - echo "Creating a bin directory..." - mkdir bin - fi - echo "Linking shell configs..." linkFile ".bashrc" @@ -84,18 +64,6 @@ function performSetup() { echo "Linking inputrc..." linkFile ".inputrc" - echo "Linking bin files" - linkBin "${BIN_DIR}/exa-0.10.0" "exa" - linkBin "${BIN_DIR}/bat-0.18.2" "bat" - linkBin "${BIN_DIR}/jq-1.6" "jq" - linkBin "${BIN_DIR}/difft-0.38.0" "difft" - linkBin "${BIN_DIR}/delta-0.14.0" "delta" - linkBin "${BIN_DIR}/dive-0.10.0" "dive" - - echo "Linking scripts" - linkBin "scripts/git-safedel" "git-safedel" - linkBin "scripts/git-top" "git-top" - echo "Installing tmux plugins" git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm