From 9ee123ab8aaa64526a402f02a000221b5e867174 Mon Sep 17 00:00:00 2001 From: DannyDannyDanny Date: Thu, 8 Jun 2023 12:46:49 +0200 Subject: [PATCH] :truck: split install script by program --- .github/workflows/main.yml | 30 +++++++++++++++++++++++++++++- install.sh | 34 +++++++--------------------------- install_fish.sh | 8 ++++++++ install_fzf.sh | 7 +++++++ install_nvim.sh | 10 ++++++++++ install_tmux.sh | 2 ++ 6 files changed, 63 insertions(+), 28 deletions(-) create mode 100644 install_fish.sh create mode 100644 install_fzf.sh create mode 100644 install_nvim.sh diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0821ea2..1c79a4a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,9 +4,37 @@ on: - main jobs: + install_nvim: + name: install nvim + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - run: bash install_nvim.sh + + install_fish: + name: install fish + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - run: bash install_fish.sh + + install_tmux: + name: install tmux + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - run: bash install_tmux.sh + + install_fzf: + name: install fzf + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - run: bash install_fzf.sh + install_codespaces_setup: name: install codespaces setup runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - run: ls -la && bash install.sh + - run: bash install.sh diff --git a/install.sh b/install.sh index d0094cf..537c28d 100755 --- a/install.sh +++ b/install.sh @@ -12,11 +12,16 @@ echo >&2 " USER $USER" echo >&2 " HOME $HOME" echo >&2 "=====================================================================" -cd $HOME - # Make passwordless sudo work export SUDO_ASKPASS=/bin/true +/bin/bash ./install_tmux.sh +/bin/bash ./install_fish.sh +/bin/bash ./install_fzf.sh +/bin/bash ./install_nvim.sh + +cd $HOME + # No thank you rm -rf .oh-my-bash rm -rf .oh-my-zsh @@ -27,28 +32,3 @@ rm -rf .oh-my-zsh # git clone https://github.com/dcreager/dotfiles-base .dotfiles.base # git clone https://github.com/dcreager/dotfiles-public -b codespaces --recurse-submodules .dotfiles.public # $HOME/.dotfiles.base/bin/dotfiles.symlink install - -/bin/bash install_tmux.sh - -# I'd like to use fish, please -echo >&2 "=====================================================================" -echo >&2 " >> installing fish" -sudo apt-get install -y fish -echo >&2 " >>> changing shell to fish" -sudo chsh -s /usr/bin/fish $USER - -# Install fzf -echo >&2 "=====================================================================" -echo >&2 " >> installing fzf" -FZF_VERSION=0.40.0 -curl -L https://github.com/junegunn/fzf/releases/download/${FZF_VERSION}/fzf-${FZF_VERSION}-linux_amd64.tar.gz | tar xzC /bin - - -# Install neovim -echo >&2 "=====================================================================" -echo >&2 " >> installing nvim" -# curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim.appimage -NVIM_VERSION=0.9.0 -curl -LO https://github.com/neovim/neovim/releases/tag/v${NVIM_VERSION}/download/nvim.appimage -chmod u+x nvim.appimage -./nvim.appimage diff --git a/install_fish.sh b/install_fish.sh new file mode 100644 index 0000000..b1d95ce --- /dev/null +++ b/install_fish.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# I'd like to use fish, please +echo >&2 "=====================================================================" +echo >&2 " >> installing fish" +sudo apt-get install -y fish +echo >&2 " >>> changing shell to fish" +sudo chsh -s /usr/bin/fish $USER diff --git a/install_fzf.sh b/install_fzf.sh new file mode 100644 index 0000000..d240b8d --- /dev/null +++ b/install_fzf.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +# Install fzf +echo >&2 "=====================================================================" +echo >&2 " >> installing fzf" +FZF_VERSION=0.40.0 +curl -L https://github.com/junegunn/fzf/releases/download/${FZF_VERSION}/fzf-${FZF_VERSION}-linux_amd64.tar.gz | tar xzC /bin diff --git a/install_nvim.sh b/install_nvim.sh new file mode 100644 index 0000000..30cae9f --- /dev/null +++ b/install_nvim.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +# Install neovim +echo >&2 "=====================================================================" +echo >&2 " >> installing nvim" +# curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim.appimage +NVIM_VERSION=0.9.0 +curl -LO https://github.com/neovim/neovim/releases/tag/v${NVIM_VERSION}/download/nvim.appimage +chmod u+x nvim.appimage +./nvim.appimage diff --git a/install_tmux.sh b/install_tmux.sh index 23c6892..be87bfc 100755 --- a/install_tmux.sh +++ b/install_tmux.sh @@ -1,3 +1,5 @@ +#!/bin/bash + echo >&2 "=====================================================================" echo >&2 " >> installing tmux" TMUX_VERSION=3.3a