diff --git a/neovim.sh b/neovim.sh index 449832c..532fa3d 100644 --- a/neovim.sh +++ b/neovim.sh @@ -42,11 +42,11 @@ local depsAlpine=(build-base cmake coreutils curl gettext-tiny-dev) case "$distro" in - debian) checkAndInstall "${depsDebian[@]}" ;; - fedora) checkAndInstall "${depsFedora[@]}" ;; - opensuse) checkAndInstall "${depsOpensuse[@]}" ;; - arch) checkAndInstall "${depsArch[@]}" ;; - alpine) checkAndInstall "${alpine[@]}" ;; + debian) run checkAndInstall "${depsDebian[@]}" ;; + fedora) run checkAndInstall "${depsFedora[@]}" ;; + opensuse) run checkAndInstall "${depsOpensuse[@]}" ;; + arch) run checkAndInstall "${depsArch[@]}" ;; + alpine) run checkAndInstall "${alpine[@]}" ;; *) echo_error "Cannot install for $distro" exit 1 @@ -59,7 +59,7 @@ cd $cloneDir || mkdir $cloneDir && cd $cloneDir if command_exists git; then - if git clone --depth=1 https://github.com/neovim/neovim.git; then + if run git clone --depth=1 https://github.com/neovim/neovim.git; then cd neovim || echo_error "Cannot navigate into neovim" else echo_error "Cannot clone the repo.." @@ -71,7 +71,7 @@ } makeInstall() { - if make CMAKE_BUILD_TYPE=RelWithDebInfo; then + if run make CMAKE_BUILD_TYPE=RelWithDebInfo; then $_sudo make install else echo_error "Failure while building!" @@ -82,20 +82,15 @@ if getImports; then case "$1" in --silent | -s) - echo_info "Updating sources and installing base dependencies.." - silentexec installBuildDependencies - - echo_info "Cloning neovim sources.." - silentexec cloneSources - - echo_info "Building neovim.." - silentexec makeInstall + silent=true ;; *) - installBuildDependencies - cloneSources - makeInstall + silent=false ;; esac fi + + installBuildDependencies + cloneSources + makeInstall }