From 2b8d7b3b92edf99f5bc919b609c0552d2465be0c Mon Sep 17 00:00:00 2001 From: Thomas Forgione Date: Sat, 19 Oct 2024 03:38:04 +0200 Subject: [PATCH] A lot of work --- Dockerfile | 15 ++ Makefile | 2 + index.html | 10 ++ test-env.sh | 8 + tforgione.sh | 493 ++++++++++++++++----------------------------------- 5 files changed, 189 insertions(+), 339 deletions(-) create mode 100644 Dockerfile create mode 100644 Makefile create mode 100644 index.html create mode 100755 test-env.sh diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..3c141ce --- /dev/null +++ b/Dockerfile @@ -0,0 +1,15 @@ +FROM debian:11 AS debian-user + +RUN \ + apt update && \ + apt install sudo && \ + useradd -m tester && \ + echo tester:tester | chpasswd && \ + usermod -aG sudo tester + +USER tester +WORKDIR /home/tester +COPY ./tforgione-2.sh /home/tester/tforgione.sh +RUN echo "cat tforgione.sh | bash" > /home/tester/.bash_history + +CMD ["bash"] diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..c3d610a --- /dev/null +++ b/Makefile @@ -0,0 +1,2 @@ +deploy: + scp tforgione.sh index.html pi:docker/sh diff --git a/index.html b/index.html new file mode 100644 index 0000000..7df9430 --- /dev/null +++ b/index.html @@ -0,0 +1,10 @@ + + + + + + +

Hello world!

+ 
curl -sSf https://sh.tforgione.fr | bash
+ + diff --git a/test-env.sh b/test-env.sh new file mode 100755 index 0000000..4986ab9 --- /dev/null +++ b/test-env.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +debian() { + docker build . --tag debian-user --debug + docker container run -it debian-user bash +} + +"$@" diff --git a/tforgione.sh b/tforgione.sh index be2ef55..dd0bd08 100755 --- a/tforgione.sh +++ b/tforgione.sh @@ -1,6 +1,5 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash -# This script installs the default things for having a stylish zsh user=$USER user_shell=`getent passwd $USER | cut -f7 -d:` @@ -42,14 +41,6 @@ test_command() { done } -yes_no_ask_required() { - yes_no_ask $@ "(required)" - if [ $? -ne 0 ]; then - error "refused to perform required task, can't continue" - exit 1 - fi -} - yes_no_ask() { info_n $@ "[Y/n]" read answer @@ -60,383 +51,207 @@ yes_no_ask() { fi } -install() { - test_command apt - if [ $? -eq 0 ]; then - sudo apt install -yqq $@ - return - fi +should_install_git=0 +should_install_zsh=0 +should_install_dotfiles=0 +should_install_update_remainder=0 +should_install_neovim=0 +should_install_rust=0 +should_install_nodejs=0 - test_command pacman - if [ $? -eq 0 ]; then - sudo pacman -S $@ - return - fi - - error "distribution not recognized, can't install $@." -} - -remove() { - test_command apt - if [ $? -eq 0 ]; then - sudo apt purge -yqq $1 - sudo apt autoremove -yqq - return - fi - - test_command pacman - if [ $? -eq 0 ]; then - sudo pacman -Rsn $1 - return - fi - - error "distribution not recognized, can't remove $1." -} - -install_python3() { - test_command apt - if [ $? -eq 0 ]; then - sudo apt install -yqq python3 python3-pip - return - fi - - test_command pacman - if [ $? -eq 0 ]; then - sudo pacman -S python python-pip - return - fi - - error "distribution not recognized, can't install python3." -} - -install_python_neovim() { - test_command pip3 - if [ $? -eq 0 ]; then - sudo pip3 install neovim - return - fi - - test_command pip - if [ $? -eq 0 ]; then - sudo pip install neovim - return - fi - - error "couldn't find pip, can't install python-neovim." -} - -install_neovim() { - test_command apt - if [ $? -eq 0 ]; then - sudo apt install -yqq neovim - return - fi - - test_command pacman - if [ $? -eq 0 ]; then - sudo pacman -S neovim - return - fi - - error "distribution not recognized, can't install neovim." -} - -git_clone() { - info_n "cloning $1..." - git clone $@ > /dev/null 2>&1 - if [ $? -eq 0 ]; then - echo " OK!" - else - echo - error "clone failed!" - fi -} - -clone_dotfiles() { - if [ ! -d $HOME/.config/dotfiles ]; then - - test_command git - if [ $? -ne 0 ]; then - if [ $sudo_available -ne 0 ]; then - error "git is needed, but you don't have git or sudo" - return 1 - else - yes_no_ask_required "you'll need git for this, do you wish to install git?" - install git - fi - fi - - git_clone https://gitea.tforgione.fr/tforgione/dotfiles/ $HOME/.config/dotfiles - - echo "# Checks that the update is done weekly, if its not done, prints a nice message" > $HOME/.config/dotfiles/zsh/extraconfig.zsh - echo "export UPDATE_CHECK=weekly" >> $HOME/.config/dotfiles/zsh/extraconfig.zsh - echo "export UPDATE_CHECK_TYPE=sliding" >> $HOME/.config/dotfiles/zsh/extraconfig.zsh - - mkdir -p $HOME/.config/dotfiles/.data - - if [ $sudo_available -ne 0 ]; then - touch $HOME/.config/dotfiles/.data/noroot - fi - fi -} - -configure_dotfiles() { - if [ ! -d $HOME/.config/dotfiles ]; then - yes_no_ask "do you wish to configure the dotfiles?" - if [ $? -ne 0 ]; then - return - fi - - clone_dotfiles - fi -} - -configure_shell() { - installed_locally=false - - yes_no_ask "do you wish to install and configure zsh?" +ask_for_dotfiles() { + yes_no_ask "do you wish to install and configure dotfiles?" if [ $? -ne 0 ]; then - yes_no_ask "you don't want zsh? Ok... but can I at least give you a nice bashrc?" - - if [ $? -ne 0 ]; then - info "ok :'( I guess I'm not doing anything then" - return - fi - - clone_dotfiles - rm -f $HOME/.bashrc - ln -s `realpath $HOME/.config/dotfiles/bashrc` `realpath $HOME/.bashrc` - - mkdir -p $HOME/.config/dotfiles/bash - echo "# Checks that the update is done weekly, if its not done, prints a nice message" > $HOME/.config/dotfiles/bash/extraconfig.bash - echo "export UPDATE_CHECK=weekly" >> $HOME/.config/dotfiles/bash/extraconfig.bash - - info "bashrc configured successfully" - return fi - clone_dotfiles - test_command zsh if [ $? -ne 0 ]; then - if [ $sudo_available -ne 0 ]; then - warn "zsh is needed, but you don't have zsh or sudo" - yes_no_ask "do you want me to compile and install zsh locally?" - if [ $? -ne 0 ]; then - error "zsh is needed, but you refused to install zsh" - return 1 - fi - installed_locally=true - info "downloading zsh..." - mkdir tmp - cd tmp - curl https://codeload.github.com/zsh-users/zsh/tar.gz/zsh-5.7.1 --output zsh.tar.gz > /dev/null 2>&1 - tar xvf zsh.tar.gz > /dev/null 2>&1 - cd zsh-zsh-5.7.1 - info "building zsh (this may take a while)..." - ./Util/preconfig > /dev/null 2>&1 - ./configure --prefix ~/.local/share > /dev/null 2>&1 - make > /dev/null 2>&1 - info "installing zsh (this may take a while)..." - make install > /dev/null 2>&1 - cd ../../ - rm -rf tmp - info "zsh installed!" - - else - yes_no_ask_required "this magnificent prompt is based on zsh, do you wish to install zsh?" - install zsh - fi + should_install_zsh=1 fi - mkdir -p $HOME/.config - if [ ! -d $HOME/.config/ohmyzsh ]; then - git_clone https://github.com/ohmyzsh/ohmyzsh $HOME/.config/ohmyzsh + test_command git + if [ $? -ne 0 ]; then + should_install_git=1 fi - if [ -f $HOME/.zshrc ]; then - path1=`realpath $HOME/.zshrc` - path2=`realpath $HOME/.config/dotfiles/zshrc` - if [ "$path1" == "$path2" ]; then - info "it seems that your zshrc is already a good link." - else - if `realpath $HOME/.zshrc`; then - warn "you already have a zshrc, it will be moved to ~/.zshrc.bak" - mv $HOME/.zshrc $HOME/.zshrc.bak - fi - info "linking zshrc" - ln -s $HOME/.config/dotfiles/zshrc $HOME/.zshrc - fi - else - info "linking zshrc" - ln -s $HOME/.config/dotfiles/zshrc $HOME/.zshrc - fi + should_install_dotfiles=1 - if [ "$user_shell" == "/bin/zsh" ]; then - info "it seems that you already use zsh." - else - info "it seems your shell is not zsh..." - - if [ $sudo_available -eq 0 ]; then - # Sudo is available, run chsh - yes_no_ask "do you want to change your shell?" - if [ $? -eq 0 ]; then - info "changing your shell" - sudo chsh $user -s /bin/zsh - else - info "not doing anything" - fi - else - info "you don't have root, but you can run 'exec zsh' at the end of your bashrc" - yes_no_ask "do you wish to do that?" - if [ $? -eq 0 ]; then - echo >> $HOME/.bashrc - if [ "$installed_locally" == "true" ]; then - echo "exec ~/.local/share/bin/zsh" >> $HOME/.bashrc - else - echo "exec zsh" >> $HOME/.bashrc - fi - echo >> $HOME/.bashrc - else - info "not doing anything" - fi - fi - fi -} - -configure_neovim() { - test_command nvim - if [ $? -ne 0 ] && [ $sudo_available -ne 0 ]; then - warn "you don't have sudo or neovim, skipping neovim configuration" + yes_no_ask "do you want a weekly remainder to do your system's update?" + if [ $? -ne 0 ]; then return fi + should_install_update_remainder=1 +} + +ask_for_neovim() { yes_no_ask "do you wish to install and configure neovim?" - - if [ $? -ne 0 ]; then - info "not installing neovim" - return - fi - - clone_dotfiles - - test_command nvim - if [ $? -ne 0 ]; then - info "installing neovim" - install_neovim - fi - - # Try and install python3 and python-neovim - test_command python3 pip3 - if [ $? -ne 0 ]; then - install_python3 - fi - - install_python_neovim - - # Create config files an directories - mkdir -p $HOME/.config/nvim $HOME/.nvim/backups $HOME/.nvim/swp $HOME/.nvim/undo - rm -f $HOME/.config/nvim/init.vim - ln -s $HOME/.config/dotfiles/init.vim $HOME/.config/nvim/init.vim - - # Install vim plug - curl -fLo $HOME/.local/share/nvim/site/autoload/plug.vim --create-dirs \ - https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim - - # Install plugins - nvim +PlugInstall +qa -} - -configure_powerline() { - yes_no_ask "do you wish to install powerline fonts?" - if [ $? -ne 0 ]; then return fi - info installing powerline fonts - git_clone https://github.com/powerline/fonts - cd fonts - ./install.sh - cd .. - rm -rf fonts + should_install_dotfiles=1 + + test_command neovim + if [ $? -ne 0 ]; then + should_install_neovim=1 + fi } -configure_rust() { +ask_for_rust() { yes_no_ask "do you wish to install and configure rust?" if [ $? -ne 0 ]; then return fi - curl https://sh.rustup.rs -sSf | sh -s -- --no-modify-path -y - export PATH=$HOME/.cargo/bin:$PATH + test_command rustc + if [ $? -ne 0 ]; then + should_install_rust=1 + fi +} - cargo_update_installed=1 - yes_no_ask "do you wish to install cargo-update? it allows to update package automatically" - if [ $? -eq 0 ]; then - cargo_update_installed=0 - cargo install cargo-update +ask_for_nodejs() { + yes_no_ask "do you wish to install and configure nodejs?" + if [ $? -ne 0 ]; then + return fi - yes_no_ask "do you wish to install racer? it enabled rust completion from vim" - if [ $? -eq 0 ]; then - rustup toolchain add nightly - cargo +nightly install racer - if [ $cargo_update_installed -eq 0 ]; then - cargo install-update-config -t nightly racer + test_command node + if [ $? -ne 0 ]; then + should_install_nodejs=1 + fi +} + +debug() { + if [ $should_install_git -eq 1 ]; then + info "should install git" + fi + + if [ $should_install_zsh -eq 1 ]; then + info "should install zsh" + fi + + if [ $should_install_dotfiles -eq 1 ]; then + info "should install dotfiles" + fi + + if [ $should_install_neovim -eq 1 ]; then + info "should install neovim" + fi + + if [ $should_install_rust -eq 1 ]; then + info "should install rust" + fi + + if [ $should_install_nodejs -eq 1 ]; then + info "should install nodejs" + fi +} + +run() { + packages=() + + if [ $should_install_git -eq 1 ]; then + packages+=(git) + fi + + if [ $should_install_zsh -eq 1 ]; then + packages+=(zsh) + fi + + if [ $should_install_dotfiles -eq 1 ]; then + packages+=(neovim) + fi + + if [ $should_install_nodejs -eq 1 ]; then + packages+=(nodejs) + packages+=(npm) + fi + + sudo apt install -y ${packages[@]} + + if [ $should_install_dotfiles -eq 1 ]; then + if [ ! -d $HOME/.config/ohmyzsh ]; then + git clone https://github.com/ohmyzsh/ohmyzsh $HOME/.config/ohmyzsh + fi + if [ ! -d $HOME/.config/dotfiles ]; then + git clone https://gitea.tforgione.fr/tforgione/dotfiles $HOME/.config/dotfiles + fi + sudo chsh $USER -s /bin/zsh + + ln -s $HOME/.config/dotfiles/zshrc $HOME/.zshrc + + + if [ $should_install_update_remainder -eq 1 ]; then + + echo "# Checks that the update is done weekly, if its not done, prints a nice message" > $HOME/.config/dotfiles/zsh/extraconfig.zsh + echo "export UPDATE_CHECK=weekly" >> $HOME/.config/dotfiles/zsh/extraconfig.zsh + echo "export UPDATE_CHECK_TYPE=sliding" >> $HOME/.config/dotfiles/zsh/extraconfig.zsh + export UPDATE_CHECK=weekly + export UPDATE_CHECK_TYPE=sliding + $HOME/.config/dotfiles/bin/update postpone fi fi -} -configure_node() { - yes_no_ask "do you wish to install and configure node and npm?" - - if [ $? -ne 0 ]; then - return + if [ $should_install_nodejs -eq 1 ]; then + mkdir -p $HOME/.npmbin + npm config set prefix $HOME/.npmbin + npm install -g npm + sudo apt purge npm -y fi - install nodejs npm + if [ $should_install_neovim -eq 1 ]; then + # Create config files an directories + mkdir -p $HOME/.nvim/backups $HOME/.nvim/swp $HOME/.nvim/undo + rm -f $HOME/.config/nvim + ln -s $HOME/.config/dotfiles/nvim $HOME/.config/nvim - mkdir ~/.npmbin - npm config set prefix ~/.npmbin - npm install -g npm + # Install vim plug + curl -fLo $HOME/.local/share/nvim/site/autoload/plug.vim --create-dirs \ + https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim - remove npm -} - -configure_awesome() { - yes_no_ask "do you wish to install and configure awesome?" - - if [ $? -ne 0 ]; then - return + # Install plugins + nvim +PlugInstall +qa fi - install awesome acpi - git_clone https://gitea.tforgione.fr/tforgione/awesome ~/.config/awesome + if [ $should_install_rust -eq 1 ]; then + curl https://sh.rustup.rs -sSf | sh -s -- --no-modify-path -y + export PATH=$HOME/.cargo/bin:$PATH + rustup component add rust-analyzer + cargo install cargo-update + fi +} - git_clone https://github.com/horst3180/arc-icon-theme --depth 1 && cd arc-icon-theme - ./autogen.sh --prefix=/usr - sudo make install - cd .. - rm -rf arc-icon-theme +banner() { + echo -e "\x1b[32;1m┌───────────────────────────────────────────────────────────────────────────────────────────┐" + echo "│ _ __ _ _ _ _ _ _ │" + echo "│ | | / _| (_) ( ) (_) | | | | | │" + echo "│ | |_| |_ ___ _ __ __ _ _ ___ _ __ ___|/ ___ _ _ __ ___| |_ __ _| | | ___ _ __ │" + echo "│ | __| _/ _ \| '__/ _\` | |/ _ \| '_ \ / _ \ / __| | | '_ \/ __| __/ _\` | | |/ _ \ '__| │" + echo "│ | |_| || (_) | | | (_| | | (_) | | | | __/ \__ \ | | | | \__ \ || (_| | | | __/ | │" + echo "│ \__|_| \___/|_| \__, |_|\___/|_| |_|\___| |___/ |_|_| |_|___/\__\__,_|_|_|\___|_| │" + echo "│ __/ | │" + echo "│ |___/ │" + echo "├───────────────────────────────────────────────────────────────────────────────────────────┤" + echo "│ WELCOME TO TFORGIONE'S INSTALLER │" + echo -e "└───────────────────────────────────────────────────────────────────────────────────────────┘\x1b[0m" } main() { - echo_green "=== WELCOME TO TFORGIONE'S CONFIG INSTALLER ===" + banner info "before anything, i need to know if your user can use sudo" yes_no_ask "can your user use sudo?" sudo_available=$? - configure_dotfiles - configure_shell - configure_neovim - configure_powerline - configure_rust - configure_node - configure_awesome + ask_for_dotfiles + ask_for_neovim + ask_for_rust + ask_for_nodejs + + debug + run } main < /dev/tty -