diff --git a/bootstrap.sh b/bootstrap.sh index 0c3e2233b753942db60ef87eaf2b418f88037273..61e0fea884d3665fdd8ec3c84f40467fc618b8e8 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -147,7 +147,7 @@ function boot_wsl(){ mv -f ~/.ssh/config ~/.ssh/config.bck fi rm -f ~/.ssh/config - yes | cp -f $PWD/src/config_wsl ~/.ssh/config &>/dev/null + yes | cp -f $PWD/src/ssh.config ~/.ssh/config &>/dev/null } function --help(){ diff --git a/bootstrap_remote.sh b/bootstrap_remote.sh index 4bc71fbc1505244cab93b65d1050051e4e84099f..bfef4fb6954c78fc569b19251ff0fa5307999401 100755 --- a/bootstrap_remote.sh +++ b/bootstrap_remote.sh @@ -40,7 +40,7 @@ else ;; *) remote_command=$1 - echo -e "Executing \e[31m$remote_command\e[0m ..." + echo -e "Command to execute \e[31m$remote_command\e[0m ..." ;; esac fi diff --git a/src/config_wsl b/src/ssh.config similarity index 90% rename from src/config_wsl rename to src/ssh.config index 85e57de02808c30dd5a13a0ae2a046a04f725130..a71915efe46857b80bd379e49aa148d8054451b0 100644 --- a/src/config_wsl +++ b/src/ssh.config @@ -5,7 +5,6 @@ ControlMaster auto ControlPersist 5 ForwardX11 yes ForwardX11Trusted yes -PreferredAuthentications publickey,keyboard-interactive,password Host ihep.cc User root diff --git a/tools/setdocker.py b/tools/setdocker.py index 5fb05982d46b97be752ad76383317c07fad82935..a95b7ba24756b794d7f9a5e5d66def8673406e9a 100755 --- a/tools/setdocker.py +++ b/tools/setdocker.py @@ -1,8 +1,7 @@ #!/usr/bin/python3 import json import argparse -import os, sys -import copy +import os parser = argparse.ArgumentParser() parser.add_argument("--proxy", type = str, default = "http://192.168.32.92:7890") diff --git a/tools/setsettings.py b/tools/setsettings.py index ae2fd2ead5bece97f3ce92bc75c1862db524ad60..b9bba1793bb0daf592466a24390a70cee7adffd7 100755 --- a/tools/setsettings.py +++ b/tools/setsettings.py @@ -1,7 +1,6 @@ #!/usr/bin/python3 import json -import os, sys -import copy +import sys def merge_list(old_list, new_list): merged_list = old_list + new_list