Clean master-cookbook of old installs that are now packages

This commit is contained in:
ViViDboarder 2017-11-13 19:18:42 -08:00
parent ab9901940d
commit 317bf639cb
2 changed files with 3 additions and 24 deletions

View File

@ -35,23 +35,12 @@ if ! command_exist 'nvim' && prompt_yn "Build Neovim?" ; then
build_neovim=true build_neovim=true
fi fi
build_fish=false
if ! command_exist 'fish' && prompt_yn "Build Fish?" ; then
build_fish=true
fi
# Optional # Optional
install_sfdc=false install_sfdc=false
if ! is_installed "salesforce" && prompt_yn "Install Salesforce tools?" ; then if ! is_installed "salesforce" && prompt_yn "Install Salesforce tools?" ; then
install_sfdc=true install_sfdc=true
fi fi
# Optional
install_golang=false
if ! command_exist 'go' && prompt_yn "Install Go?" ; then
install_golang=true
fi
### Run recipes ### Run recipes
if $install_packages ; then if $install_packages ; then
recipe 'packages' recipe 'packages'
@ -77,21 +66,11 @@ if $build_neovim ; then
set_installed "neovim" set_installed "neovim"
fi fi
if $build_fish ; then
recipe 'build-fish'
set_installed "build-fish"
fi
if $install_sfdc ; then if $install_sfdc ; then
recipe 'salesforce' recipe 'salesforce'
set_installed 'salesforce' set_installed 'salesforce'
fi fi
if $install_golang ; then
recipe 'golang'
set_installed 'golang'
fi
### Show the Finished banner ### Show the Finished banner
finished finished

View File

@ -11,7 +11,7 @@ case "$PACKAGE_MANAGER" in
sudo_package 'libtool automake cmake pkg-config gettext ninja' sudo_package 'libtool automake cmake pkg-config gettext ninja'
;; ;;
"apt-get") "apt-get")
sudo_package 'libtool libtool-bin autoconf automake cmake g++ pkg-config unzip ninja-build' sudo_package 'libtool libtool-bin autoconf automake cmake g++ gettext pkg-config unzip ninja-build'
# Ensure python support is in nvim # Ensure python support is in nvim
sudo_package 'python-dev python-pip python3-dev python3-pip' sudo_package 'python-dev python-pip python3-dev python3-pip'
;; ;;
@ -28,7 +28,7 @@ if [ ! -d $neovim_dir ]; then
log "Cloning neovim" log "Cloning neovim"
git clone https://github.com/neovim/neovim $neovim_dir git clone https://github.com/neovim/neovim $neovim_dir
else else
(cd $neovim_dir && git pull) (cd $neovim_dir && git fetch)
fi fi
(cd $neovim_dir && make && sudo make install) (cd $neovim_dir && git checkout stable && make && sudo make install)