From 138b0cbac3d8798c0201bc7ca72d0192d493c5da Mon Sep 17 00:00:00 2001 From: Alexander Serowy Date: Thu, 1 Apr 2021 13:40:38 +0200 Subject: [PATCH 1/4] added pip3 to validation --- install.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 938da785..658e10de 100755 --- a/install.sh +++ b/install.sh @@ -64,7 +64,11 @@ install_node_deps () { } install_python_deps () { - if [[ -z $(which pip) ]]; then + if [[ -z $(which pip) && $(which pip3) ]]; then + echo "python/pip not installed" + return + fi + sudo python3 -m pip install $@ ]]; then echo "python/pip not installed" return fi From 8996ff7f598d154483f3a6d61e8c41f83ae1ff07 Mon Sep 17 00:00:00 2001 From: Alexander Serowy Date: Thu, 1 Apr 2021 13:54:10 +0200 Subject: [PATCH 2/4] fixed paste bug --- install.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/install.sh b/install.sh index 658e10de..e3928eec 100755 --- a/install.sh +++ b/install.sh @@ -60,7 +60,7 @@ install_node_deps () { echo "npm not installed" return fi - sudo npm install -g $@ + sudo npm install -g $@ } install_python_deps () { @@ -68,11 +68,7 @@ install_python_deps () { echo "python/pip not installed" return fi - sudo python3 -m pip install $@ ]]; then - echo "python/pip not installed" - return - fi - sudo python3 -m pip install $@ + sudo python3 -m pip install $@ } install_ts() { From 43b1289a82c51d1d4c3e187fd128d445b4d610b3 Mon Sep 17 00:00:00 2001 From: Alexander Serowy Date: Thu, 1 Apr 2021 13:57:15 +0200 Subject: [PATCH 3/4] fixed --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index e3928eec..aaa0e0b5 100755 --- a/install.sh +++ b/install.sh @@ -64,7 +64,7 @@ install_node_deps () { } install_python_deps () { - if [[ -z $(which pip) && $(which pip3) ]]; then + if [[ -z $(which pip) && -z $(which pip3) ]]; then echo "python/pip not installed" return fi From 3a917ee68360e70c7dcacc7922e6d3e426dbb5bd Mon Sep 17 00:00:00 2001 From: Alexander Serowy Date: Thu, 1 Apr 2021 14:00:32 +0200 Subject: [PATCH 4/4] made mkdir more robust --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index aaa0e0b5..fdce7d50 100755 --- a/install.sh +++ b/install.sh @@ -35,7 +35,7 @@ heading "old nvim config will be deleted so watchout :0" # copying config -rm -rf ~/.config/nvim/ && mkdir ~/.config/nvim +rm -rf ~/.config/nvim/ && mkdir -p ~/.config/nvim cp -r init.lua ~/.config/nvim && cp -r lua ~/.config/nvim #for f in `find -E . -regex ".*\.vim$|.*\.lua$"`; do