From dfaae83b875b0576d6749ac80d206cd0106a2e75 Mon Sep 17 00:00:00 2001
From: root <root@zhangxuantong.ihep.ac.cn>
Date: Fri, 6 Sep 2024 13:11:16 +0800
Subject: [PATCH] fix vim and docker bug
---
bootstrap.sh | 15 +++++++++------
tools/setdocker.py | 11 ++++++++---
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/bootstrap.sh b/bootstrap.sh
index 55b198b..c73b1c1 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -31,25 +31,28 @@ function setDocker(){
if yum list installed docker-ce &>/dev/null; then
wget -O /etc/yum.repos.d/docker-ce.repo https://mirrors.aliyun.com/docker-ce/linux/centos/docker-ce.repo &>/dev/null
$PWD/tools/setdocker.py --proxy="http://$PROXYIP:$PROXYPORT"
- systemctl daemon-reload
- if systemctl is-active docker -q; then systemctl restart docker; fi
+ if [[ $? == 0 ]]; then
+ systemctl daemon-reload
+ if systemctl is-active docker -q; then systemctl restart docker; fi
+ fi
fi
}
function setVim(){
# for git and wsl
echo -e "\e[32mConfiguring Vim...\e[0m"
+ yes | cp -f $PWD/src/vimrc_base ~/.env/vimrc_base &>/dev/null
+ if ! grep "source ~/.env/vimrc_base" ~/.vimrc &>/dev/null; then echo -e "source ~/.env/vimrc_base" >> ~/.vimrc; fi
+
if [[ ! -f ~/.vim/autoload/plug.vim ]]; then
wget -q -P ~/.vim/autoload/ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
- vim -c PlugUpdate -c PlugClean -c qa
+ vim -E -s -u ~/.vimrc -c PlugUpdate -c PlugClean -c qa
else
if [[ $(ls -l ~/.vim/autoload/plug.vim | awk '{print $5}') -eq 0 ]]; then
wget -q -P ~/.vim/autoload/ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
fi
- vim -c PlugUpgrade -c PlugUpdate -c PlugClean -c qa
+ vim -E -s -u ~/.vimrc -c PlugUpgrade -c PlugUpdate -c PlugClean -c qa
fi
- yes | cp -f $PWD/src/vimrc_base ~/.env/vimrc_base &>/dev/null
- if ! grep "source ~/.env/vimrc_base" ~/.vimrc &>/dev/null; then echo -e "source ~/.env/vimrc_base" >> ~/.vimrc; fi
}
function setGithub(){
diff --git a/tools/setdocker.py b/tools/setdocker.py
index 1dd7773..5fb0598 100755
--- a/tools/setdocker.py
+++ b/tools/setdocker.py
@@ -21,11 +21,16 @@ if not os.path.exists(file_path):
# print(json.dumps(proxy_json, indent = 2))
with open(file_path, 'w') as f:
f.write(json.dumps(proxy_json, indent = 2))
+ exit(0)
else:
with open(file_path, 'r') as f:
conf_json = json.load(f)
if not conf_json.get("proxies"):
conf_json.update(proxy_json)
- # print(json.dumps(conf_json))
- with open(file_path, 'w') as f:
- f.write(json.dumps(conf_json, indent = 2))
+ # print(json.dumps(conf_json))
+ with open(file_path, 'w') as f:
+ f.write(json.dumps(conf_json, indent = 2))
+ exit(0)
+ else:
+ exit(1)
+
--
GitLab