apt,dnf install neovim from packages instead of from source

linrongbin16 · Aug 22, 2022 · 3ec7bc6 · 3ec7bc6
1 parent 9d1a621
commit 3ec7bc6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 27 deletions.
diff --git a/install/apt.sh b/install/apt.sh
@@ -17,6 +17,17 @@ $INSTALL/install_or_skip.sh "sudo apt-get install -y cmake" "cmake"
 $INSTALL/install_or_skip.sh "sudo apt-get install -y xclip" "xclip"
 $INSTALL/install_or_skip.sh "sudo apt-get install -y wl-clipboard" "wl-copy"
 
+# neovim
+if ! type "nvim" >/dev/null 2>&1; then
+    $INSTALL/msg.sh "install 'nvim' from ppa:neovim-ppa/stable..."
+    sudo apt-get install -y software-properties-common
+    sudo add-apt-repository ppa:neovim-ppa/stable
+    sudo apt-get update
+    sudo apt-get install -y neovim
+else
+    $INSTALL/msg.sh "'nvim' already exist, skip..."
+fi
+
 # python3
 $INSTALL/install_or_skip.sh "sudo apt-get install -y python3 python3-dev python3-venv python3-pip python3-docutils" "python3"
 $INSTALL/install_or_skip.sh "sudo apt-get install -y python3 python3-dev python3-venv python3-pip python3-docutils" "pip3"
@@ -30,13 +41,6 @@ else
     $INSTALL/msg.sh "'node' already exist, skip..."
 fi
 
-# neovim
-if ! type "nvim" >/dev/null 2>&1; then
-    $INSTALL/install_neovim.sh
-else
-    $INSTALL/msg.sh "'nvim' already exist, skip..."
-fi
-
 # ctags
 if ! type "ctags" >/dev/null 2>&1; then
     sudo apt-get install -y libseccomp-dev

diff --git a/install/dnf.sh b/install/dnf.sh
@@ -8,6 +8,7 @@ sudo dnf check-update
 $INSTALL/install_or_skip.sh "sudo dnf group install -y \"Development Tools\"" "gcc" "g++"
 $INSTALL/install_or_skip.sh "sudo dnf install -y vim" "vim"
 $INSTALL/install_or_skip.sh "sudo dnf install -y gvim" "gvim"
+$INSTALL/install_or_skip.sh "sudo dnf install -y neovim" "nvim"
 $INSTALL/install_or_skip.sh "sudo dnf install -y curl" "curl"
 $INSTALL/install_or_skip.sh "sudo dnf install -y wget" "wget"
 $INSTALL/install_or_skip.sh "sudo dnf install -y autoconf" "autoconf"
@@ -23,13 +24,6 @@ $INSTALL/install_or_skip.sh "sudo dnf install -y python3 python3-devel python3-p
 # nodejs
 $INSTALL/install_or_skip.sh "sudo dnf install -y nodejs npm" "node"
 
-# neovim
-if ! type "nvim" >/dev/null 2>&1; then
-    $INSTALL/install_neovim.sh
-else
-    $INSTALL/msg.sh "'nvim' already exist, skip..."
-fi
-
 # ctags
 if ! type "ctags" >/dev/null 2>&1; then
     sudo dnf install -y libseccomp-devel

diff --git a/install/install_neovim.sh b/install/install_neovim.sh