Switch from port/apt to rustup

This commit is contained in:
ViViDboarder 2019-04-11 13:23:36 -07:00
parent 4e0fa1d8be
commit 8a7f1516fb
2 changed files with 11 additions and 5 deletions

View File

@ -35,6 +35,11 @@ if ! command_exist 'nvim' && prompt_yn "Build Neovim?" ; then
build_neovim=true build_neovim=true
fi fi
install_rustup=false
if ! command_exist 'rustup' && prompt_yn "Install rustup?" ; then
install_rustup=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
@ -60,6 +65,11 @@ recipe 'fish'
git submodule init git submodule init
git submodule update git submodule update
if $install_rustup ; then
recipe 'rust'
set_installed 'rustup'
fi
if $build_vim ; then if $build_vim ; then
recipe 'build-vim' recipe 'build-vim'
set_installed "build-vim" set_installed "build-vim"

View File

@ -3,7 +3,7 @@
sudo_package_update sudo_package_update
packages="tmux htop curl wget mercurial ctags tig pv jq fish mosh bash-completion doxygen" packages="tmux htop curl wget mercurial ctags tig pv jq fish mosh bash-completion doxygen"
# This now installs a lot of language specific stuff from python, gradle, and go, to rust. # This now installs a lot of language specific stuff from python, gradle, to go.
# Should consider pulling these into different recipes that are dependent on the environment # Should consider pulling these into different recipes that are dependent on the environment
# that I wish to bootstrap. If not a dev environment, I can trim out some of this. # that I wish to bootstrap. If not a dev environment, I can trim out some of this.
@ -12,8 +12,6 @@ case "$PACKAGE_MANAGER" in
"port") "port")
# Non-standard packages # Non-standard packages
packages="$packages the_silver_searcher md5sha1sum gradle go bash apache-ant" packages="$packages the_silver_searcher md5sha1sum gradle go bash apache-ant"
# Rust
packages="$packages rust cargo"
# Python packages # Python packages
packages="$packages python27 py27-ipython py27-pip py27-six py27-tox py27-flake8 py27-virtualenv" packages="$packages python27 py27-ipython py27-pip py27-six py27-tox py27-flake8 py27-virtualenv"
packages="$packages python37 py37-ipython py37-pip py37-six py37-tox py37-flake8 py37-virtualenv" packages="$packages python37 py37-ipython py37-pip py37-six py37-tox py37-flake8 py37-virtualenv"
@ -54,8 +52,6 @@ case "$PACKAGE_MANAGER" in
packages="$packages python3 python3-ipython python3-pip python3-six python3-flake8 python3-virtualenv python3-venv" packages="$packages python3 python3-ipython python3-pip python3-six python3-flake8 python3-virtualenv python3-venv"
# No python3-tox for ubuntu # No python3-tox for ubuntu
sudo pip3 install tox sudo pip3 install tox
# Rust
packages="$packages rustc cargo"
sudo_package $packages sudo_package $packages
;; ;;