From 6f4dd8471b24f71ed6712fb6b9acc0ac79b9137a Mon Sep 17 00:00:00 2001 From: Manpreet Singh Date: Fri, 30 Jul 2021 12:01:54 -0700 Subject: Protect against a strict umask (#1168) --- utils/installer/install.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'utils/installer/install.sh') diff --git a/utils/installer/install.sh b/utils/installer/install.sh index 5778fb3a..abb35b99 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -113,6 +113,7 @@ cloneconfig() { esac mkdir -p "$HOME/.config/lvim" sudo cp "$HOME/.local/share/lunarvim/lvim/utils/bin/lvim" "/usr/local/bin" + sudo chmod a+rx /usr/local/bin/lvim cp "$HOME/.local/share/lunarvim/lvim/utils/installer/lv-config.example-no-ts.lua" "$HOME/.config/lvim/lv-config.lua" nvim -u ~/.local/share/lunarvim/lvim/init.lua --cmd "set runtimepath+=~/.local/share/lunarvim/lvim" --headless \ -- cgit v1.2.3 From 213e3961fa637e4dbe4ef1ea5fceadcb372e020e Mon Sep 17 00:00:00 2001 From: chaeing Date: Sat, 31 Jul 2021 11:28:59 -0700 Subject: [Feature] Rename lv-config.lua to config.lua (#1193) * Rename example config files * Update user config path in installer * Update user config path with a variable * Update default user config file to config.lua * Add fallback to lv-config if config.lua not found * Add global variable USER_CONFIG_PATH --- utils/installer/install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'utils/installer/install.sh') diff --git a/utils/installer/install.sh b/utils/installer/install.sh index abb35b99..d6691a92 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -114,7 +114,7 @@ cloneconfig() { mkdir -p "$HOME/.config/lvim" sudo cp "$HOME/.local/share/lunarvim/lvim/utils/bin/lvim" "/usr/local/bin" sudo chmod a+rx /usr/local/bin/lvim - cp "$HOME/.local/share/lunarvim/lvim/utils/installer/lv-config.example-no-ts.lua" "$HOME/.config/lvim/lv-config.lua" + cp "$HOME/.local/share/lunarvim/lvim/utils/installer/config.example-no-ts.lua" "$HOME/.config/lvim/config.lua" nvim -u ~/.local/share/lunarvim/lvim/init.lua --cmd "set runtimepath+=~/.local/share/lunarvim/lvim" --headless \ +'autocmd User PackerComplete sleep 100m | qall' \ @@ -127,9 +127,9 @@ cloneconfig() { printf "\nCompile Complete\n" if [ -e "$HOME/.local/share/lunarvim/lvim/init.lua" ]; then - echo 'lv-config already present' + echo 'config.lua already present' else - cp "$HOME/.local/share/lunarvim/lvim/utils/installer/lv-config.example.lua" "$HOME/.config/lvim/lv-config.lua" + cp "$HOME/.local/share/lunarvim/lvim/utils/installer/config.example.lua" "$HOME/.config/lvim/config.lua" fi } -- cgit v1.2.3 From c2ef6f43e25b419955e0235f5fa1dbf1da161bbc Mon Sep 17 00:00:00 2001 From: rayane866 Date: Mon, 2 Aug 2021 17:04:26 +0100 Subject: [Feature]: Termux Support (#1206) --- utils/installer/install.sh | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'utils/installer/install.sh') diff --git a/utils/installer/install.sh b/utils/installer/install.sh index d6691a92..72a8cabb 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -1,6 +1,7 @@ #!/bin/sh #Set Variable to master is not set differently LVBRANCH="${LVBRANCH:-master}" +USER_BIN_DIR="/usr/local/bin" set -o nounset # error when referencing undefined variable set -o errexit # exit when command fails @@ -15,6 +16,10 @@ installnodeubuntu() { sudo apt install npm } +installnodetermux() { + apt install nodejs +} + moveoldlvim() { echo "Not installing LunarVim" echo "Please move your ~/.local/share/lunarvim folder before installing" @@ -49,6 +54,7 @@ installnode() { [ -f "/etc/artix-release" ] && installnodearch [ -f "/etc/fedora-release" ] && installnodefedora [ -f "/etc/gentoo-release" ] && installnodegentoo + [ -d "/data/data/com.termux" ] && installnodetermux [ "$(uname -s | cut -c 1-10)" = "MINGW64_NT" ] && echo "Windows not currently supported" sudo npm i -g neovim } @@ -63,6 +69,10 @@ installpiponubuntu() { sudo apt install python3-pip >/dev/null } +installpipontermux() { + apt install python +} + installpiponarch() { sudo pacman -S python-pip } @@ -82,6 +92,7 @@ installpip() { [ -f "/etc/arch-release" ] && installpiponarch [ -f "/etc/fedora-release" ] && installpiponfedora [ -f "/etc/gentoo-release" ] && installpipongentoo + [ -d "/data/data/com.termux" ] && installpipontermux [ "$(uname -s | cut -c 1-10)" = "MINGW64_NT" ] && echo "Windows not currently supported" } @@ -100,6 +111,12 @@ installpacker() { } cloneconfig() { + if [ -d "/data/data/com.termux" ]; then + sudo() { + eval "$@" + } + USER_BIN_DIR="$HOME/../usr/bin" + fi echo "Cloning LunarVim configuration" mkdir -p ~/.local/share/lunarvim case "$@" in @@ -112,8 +129,8 @@ cloneconfig() { ;; esac mkdir -p "$HOME/.config/lvim" - sudo cp "$HOME/.local/share/lunarvim/lvim/utils/bin/lvim" "/usr/local/bin" - sudo chmod a+rx /usr/local/bin/lvim + sudo cp "$HOME/.local/share/lunarvim/lvim/utils/bin/lvim" "$USER_BIN_DIR" + sudo chmod a+rx "$USER_BIN_DIR"/lvim cp "$HOME/.local/share/lunarvim/lvim/utils/installer/config.example-no-ts.lua" "$HOME/.config/lvim/config.lua" nvim -u ~/.local/share/lunarvim/lvim/init.lua --cmd "set runtimepath+=~/.local/share/lunarvim/lvim" --headless \ @@ -162,6 +179,12 @@ installonubuntu() { npm install -g tree-sitter-cli } +installtermux() { + apt install ripgrep fzf + pip install neovim-remote + npm install -g tree-sitter-cli +} + installonarch() { sudo pacman -S ripgrep fzf pip3 install neovim-remote @@ -185,6 +208,7 @@ installextrapackages() { [ -f "/etc/artix-release" ] && installonarch [ -f "/etc/fedora-release" ] && installonfedora [ -f "/etc/gentoo-release" ] && installongentoo + [ -d "/data/data/com.termux" ] && installtermux [ "$(uname -s | cut -c 1-10)" = "MINGW64_NT" ] && echo "Windows not currently supported" } -- cgit v1.2.3 From 686e54ab0dfa5ffcac37599e5de7984f1d9e738f Mon Sep 17 00:00:00 2001 From: christianchiarulli Date: Tue, 3 Aug 2021 23:12:05 -0400 Subject: check if git is installed --- utils/installer/install.sh | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'utils/installer/install.sh') diff --git a/utils/installer/install.sh b/utils/installer/install.sh index 72a8cabb..37be7ad5 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -158,6 +158,11 @@ asktoinstallnode() { [ "$answer" != "${answer#[Yy]}" ] && installnode } +asktoinstallgit() { + echo "git not found, please install git" + exit +} + asktoinstallpip() { # echo "pip not found" # echo -n "Would you like to install pip now (y/n)? " @@ -227,6 +232,9 @@ esac # move old lvim directory if it exists [ -d "$HOME/.local/share/lunarvim" ] && moveoldlvim +# install node and neovim support +(command -v git >/dev/null && echo "git installed, moving on...") || asktoinstallgit + # install pip (command -v pip3 >/dev/null && echo "pip installed, moving on...") || asktoinstallpip -- cgit v1.2.3 From 3bfa31aaa0f4353b474348c262ab17b3caa367e0 Mon Sep 17 00:00:00 2001 From: Abouzar Parvan Date: Wed, 4 Aug 2021 05:32:45 +0000 Subject: fix shfmt issue --- utils/installer/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'utils/installer/install.sh') diff --git a/utils/installer/install.sh b/utils/installer/install.sh index 37be7ad5..2488ed51 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -160,7 +160,7 @@ asktoinstallnode() { asktoinstallgit() { echo "git not found, please install git" - exit + exit } asktoinstallpip() { -- cgit v1.2.3 From 120590b8eca0d94d88272bf7a8db7c8cb7a0f530 Mon Sep 17 00:00:00 2001 From: Abouzar Parvan Date: Wed, 4 Aug 2021 10:05:02 +0430 Subject: shfmt correct fix (#1221) --- utils/installer/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'utils/installer/install.sh') diff --git a/utils/installer/install.sh b/utils/installer/install.sh index 2488ed51..b3929409 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -160,7 +160,7 @@ asktoinstallnode() { asktoinstallgit() { echo "git not found, please install git" - exit + exit } asktoinstallpip() { -- cgit v1.2.3 From 97fa3d9ec9e7d2416ed2d169eea757096db4581b Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 4 Aug 2021 15:20:09 -0400 Subject: update for lunarvim org --- utils/installer/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'utils/installer/install.sh') diff --git a/utils/installer/install.sh b/utils/installer/install.sh index b3929409..25b67f12 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -125,7 +125,7 @@ cloneconfig() { cp -r "$(pwd)" ~/.local/share/lunarvim/lvim ;; *) - git clone --branch "$LVBRANCH" https://github.com/ChristianChiarulli/lunarvim.git ~/.local/share/lunarvim/lvim + git clone --branch "$LVBRANCH" https://github.com/lunarvim/lunarvim.git ~/.local/share/lunarvim/lvim ;; esac mkdir -p "$HOME/.config/lvim" -- cgit v1.2.3