diff --git a/.gitignore b/.gitignore index a38e50e..ad43a85 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ vim/.netrwhist vim/.VimballRecord vim/bundle/* !vim/bundle/Vundle.vim +logs *.log *.swp *.orig diff --git a/functions.sh b/functions.sh index 87fcfb3..df656fe 100644 --- a/functions.sh +++ b/functions.sh @@ -231,9 +231,10 @@ sshmyshellconfig() { if grep -q bashrc_add ~/.bashrc ;then sed -i -e '/bashrc_add/d' ~/.bashrc fi + sed -i -e '/#MYSHELLCONFIG-start/,/#MYSHELLCONFIG-end/d' ~/.bashrc echo #printf "%s" "[ -f bashrc_add ] && . bashrc_add" | tee -a ~/.bashrc - printf "%s" "if [ -e \\${MYSHELLCONFIG_BASE}/bashrc_add ]; then \n . \\${MYSHELLCONFIG_BASE}/bashrc_add;\nelse\n if [ -f bashrc_add ] ;then \n . bashrc_add;\n fi;\nfi" |tee -a ~/.bashrc + printf "%s\n" "#MYSHELLCONFIG-start" "if [ -e \\\${MYSHELLCONFIG_BASE}/bashrc_add ]; then" " . \\\${MYSHELLCONFIG_BASE}/bashrc_add;" "else" " if [ -f ~/bashrc_add ] ;then" " . ~/bashrc_add;" " fi;" "fi" "#MYSHELLCONFIG-end" |tee -a ~/.bashrc echo EOF