diff --git a/dev/pyenv/install b/dev/pyenv/install index 97de08e0..a6876622 100755 --- a/dev/pyenv/install +++ b/dev/pyenv/install @@ -2,7 +2,6 @@ if [[ -d "$HOME/.pyenv" ]]; then >&2 echo "~/.pyenv already exists, can't install." - exit 1 else git clone https://github.com/yyuu/pyenv.git $HOME/.pyenv fi diff --git a/dev/rbenv/install b/dev/rbenv/install index ef8a2f02..f51cdb26 100755 --- a/dev/rbenv/install +++ b/dev/rbenv/install @@ -2,7 +2,6 @@ if [[ -d "$HOME/.rbenv" ]]; then >&2 echo "~/.rbenv already exists, can't install." - exit 1 else git clone https://github.com/rbenv/rbenv.git $HOME/.rbenv git clone https://github.com/rbenv/ruby-build.git $HOME/.rbenv/plugins/ruby-build diff --git a/editor/neovim/install b/editor/neovim/install index aa5ba9d3..8cb3a4d7 100755 --- a/editor/neovim/install +++ b/editor/neovim/install @@ -2,7 +2,7 @@ case $OSTYPE in darwin*) - command -v nvim >/dev/null || brew install --HEAD neovim/neovim/neovim + command -v nvim >/dev/null || brew install --HEAD neovim/neovim/neovim ;; linux*) if [[ -f /etc/arch-release ]]; then diff --git a/editor/neovim/update b/editor/neovim/update index 3066f174..de3fa84d 100755 --- a/editor/neovim/update +++ b/editor/neovim/update @@ -1,7 +1,5 @@ #!/usr/bin/env bash -command -v nvim >/dev/null || exit - if [[ -d "$HOME/.vim" ]]; then cd "$HOME/.vim" make update diff --git a/editor/vim/install b/editor/vim/install index 16416c7f..d038c8ff 100755 --- a/editor/vim/install +++ b/editor/vim/install @@ -7,9 +7,6 @@ case $OSTYPE in linux*) if [[ -f /etc/arch-release ]]; then sudo pacman --needed --noconfirm -S make vim - elif [[ -f /etc/debian_version ]]; then - # TODO - exit 1 fi ;; esac diff --git a/editor/vimlite/install b/editor/vimlite/install index 60b4bceb..35765d71 100755 --- a/editor/vimlite/install +++ b/editor/vimlite/install @@ -9,7 +9,6 @@ case $OSTYPE in sudo pacman --needed --noconfirm -S vim elif [[ -f /etc/debian_version ]]; then sudo apt-get install -y vim - exit 1 fi ;; esac diff --git a/vcs/git/install b/vcs/git/install index 424cc123..fe9da108 100755 --- a/vcs/git/install +++ b/vcs/git/install @@ -1,7 +1,5 @@ #!/bin/bash -command -v git >/dev/null && command -v hub >/dev/null && exit - case "$OSTYPE" in darwin*) brew install git hub @@ -11,8 +9,10 @@ case "$OSTYPE" in sudo pacman --needed --noconfirm -S git hub elif [[ -f /etc/debian-version ]]; then sudo apt-get install -y git - mkdir -p $HOME/builds && cd $HOME/builds - git clone https://github.com/github/hub.git && cd hub - make install prefix=/usr/local + if ! command -v hub >/dev/null; then + mkdir -p $HOME/builds && cd $HOME/builds + git clone https://github.com/github/hub.git && cd hub + make install prefix=/usr/local + fi fi esac diff --git a/vcs/hg/install b/vcs/hg/install index 1f74566e..968a3017 100755 --- a/vcs/hg/install +++ b/vcs/hg/install @@ -1,14 +1,12 @@ #!/bin/bash -command -v hg >/dev/null && exit - -case "$OSTYPE" in +case $OSTYPE in darwin*) brew install mercurial ;; linux*) if [ -f /etc/arch-release ]; then - sudo pacman --noconfirm -S mercurial + sudo pacman --needed --noconfirm -S mercurial elif [ -f /etc/debian-version ]; then sudo apt-get -y mercurial fi