From d1f23d1bc3b33988131099a77b55dd9f86a04e01 Mon Sep 17 00:00:00 2001 From: Akianonymus Date: Fri, 16 Jul 2021 10:51:12 +0530 Subject: [PATCH] [4/4] Refactor: install.sh: Don't handle packer use +":lua require 'pluginList' vim.cmd('PackerSync')" only for update as PackerSync should trigger on fresh install automatically --- install.sh | 69 +++++++++++++++--------------------------------------- 1 file changed, 19 insertions(+), 50 deletions(-) diff --git a/install.sh b/install.sh index 3f3b9e17..3ae66ae3 100755 --- a/install.sh +++ b/install.sh @@ -33,36 +33,6 @@ _check_nvim_version() { done } -_setup_packer() { - _clone_packer() { - [ -d "${_PACKER_PATH}" ] && rm -rf "${_PACKER_PATH}" - - printf "\n%s\n" "=> Cloning packer.." - if "${_GIT}" clone "${_PACKER_REPO_URL}" \ - "${_PACKER_PATH}" --depth 20; then - printf "%s\n" "=> Packer Installed!" - else - printf "Error: Couldn't clone packer\n" - exit 1 - fi - } - - if [ "${_UPDATE}" = "true" ]; then - printf "%s\n" "Updating packer" - { [ -d "${_PACKER_PATH}" ] \ - && "${_GIT}" -C "${_PACKER_PATH}" pull "${_PACKER_REPO_URL}"; } || _clone_packer - else - printf "%s\n" "Installing packer" - if [ -d ~/.local/share/nvim/site/pack/packer ]; then - printf "%s\n" "Clearing previous packer installs" - rm -rf ~/.local/share/nvim/site/pack - fi - _clone_packer - fi - printf "\n" - return 0 -} - _copy_config() { printf "%s\n" "Linking config" printf "%s\n" "Old nvim config will be changed to nvim.bak if exists! :0" @@ -124,8 +94,6 @@ _setup_terminal_shell() { _setup_arguments() { # default variables to be used - _PACKER_PATH="${HOME}/.local/share/nvim/site/pack/packer/start/packer.nvim" - _PACKER_REPO_URL="https://github.com/wbthomason/packer.nvim" _CONFIG_PATH="${HOME}/.config/nvim" _UPDATE="" _BACKUP_PATH="${_CONFIG_PATH}.bak" @@ -133,22 +101,22 @@ _setup_arguments() { _CURRENT_SHELL="${SHELL##*/}" _check_longoptions() { - [ -z "${2}" ] \ - && printf '%s: %s: option requires an argument\nTry '"%s -h/--help"' for more information.\n' "${0##*/}" "${1}" "${0##*/}" \ - && exit 1 + [ -z "${2}" ] && + printf '%s: %s: option requires an argument\nTry '"%s -h/--help"' for more information.\n' "${0##*/}" "${1}" "${0##*/}" && + exit 1 return 0 } while [ $# -gt 0 ]; do case "${1}" in - -h | --help) _usage ;; - -i | --install) _UPDATE="false" ;; - -u | --update) _UPDATE="true" ;; - -b | --backup) - _check_longoptions "${1}" "${2}" - _BACKUP_PATH="${2}" && shift - ;; - -nb | --nobackup) _NO_BACKUP="true" ;; + -h | --help) _usage ;; + -i | --install) _UPDATE="false" ;; + -u | --update) _UPDATE="true" ;; + -b | --backup) + _check_longoptions "${1}" "${2}" + _BACKUP_PATH="${2}" && shift + ;; + -nb | --nobackup) _NO_BACKUP="true" ;; esac shift done @@ -178,22 +146,23 @@ main() { _check_install_dependencies _setup_arguments "${@}" - _setup_packer _copy_config _setup_terminal_shell # install all plugins + compile them if _NVIM="$(command -v nvim)"; then if _check_nvim_version; then - printf "\n%s\n" "=> Neovim will open with some errors, just press enter" && sleep 1 - "${_NVIM}" +PackerSync + printf "\n%s\n" "=> Neovim will now open." && sleep 1 + if [ "${_UPDATE}" = "false" ]; then + "${_NVIM}" +":lua require 'pluginList' vim.cmd('PackerSync')" + else + "${_NVIM}" + fi else - printf "Error: Neovim is installed, but version is lower than 0.5.x, install Neovim >= 5.x and then run the below command.\n" - printf " nvim +PackerSync\n" + printf "Error: Neovim is installed, but version is lower than 0.5.x, install Neovim >= 5.x and then run nvim & do :PackerSync\n." fi else - printf "Error: Neovim is not installed, install Neovim >= 5.x and then run the below command\n" - printf " nvim +PackerSync\n" + printf "Error: Neovim is not installed, install Neovim >= 5.x and then run neovim & do :PackerSync.\n" fi }