diff --git a/neovim.sh b/neovim.sh index 429bee5..e91d275 100644 --- a/neovim.sh +++ b/neovim.sh @@ -59,7 +59,7 @@ } getDependencies() { - echo_info "Checking build dependencies, and installs missing.." + echo_pkg "Checking build dependencies, and installs missing.." local depsDebian=(git ninja-build gettext cmake curl build-essential) local depsFedora=(git ninja-build cmake gcc make gettext curl glibc-gconv-extra) @@ -79,7 +79,9 @@ declare -n pkgArray="${deps[$distro]}" case "$distro" in - debian | ubuntu | arch | fedora | alpine | opensuse) checkAndInstall "${pkgArray[@]}" ;; + debian | ubuntu | arch | fedora | alpine | opensuse) + checkAndInstall "${pkgArray[@]}" + ;; *) echo_error "Cannot install for $distro" exit 1 @@ -89,7 +91,7 @@ cloneSources() { cloneDir="$(mktemp -d)" - echo_info "Cloning neovim sources into tempdir at $cloneDir/neovim" + echo_pkg "Cloning neovim sources into tempdir at $cloneDir/neovim" cd $cloneDir || mkdir $cloneDir && cd $cloneDir if command_exists git; then @@ -106,9 +108,9 @@ } makeInstall() { - echo_info "Compiling neovim from source" + echo_pkg "Compiling neovim from source" if run make CMAKE_BUILD_TYPE=RelWithDebInfo; then - echo_info "Installing neovim.." + echo_pkg "Installing neovim.." run $_sudo make install else echo_error "Failure while building!" diff --git a/rofi.sh b/rofi.sh index c84e266..5a35d1b 100644 --- a/rofi.sh +++ b/rofi.sh @@ -16,8 +16,8 @@ PACKAGE=rofi if command_exists "$PACKAGE"; then - echo "${RED}$PACKAGE ${BRIGHT_RED}is already installed!${NC}" - echo "${BOLD}${RED}Exiting now!${NC}" + echo "$PACKAGE is already installed!" + echo "Exiting now!" exit 69 fi @@ -135,7 +135,7 @@ echo_error "Error when installing dependencies.." fi - rofi_clone_and_build + rofi_clone_and_build