diff --git a/.ci/script.sh b/.ci/script.sh index be9d7ac87..14ffe2333 100755 --- a/.ci/script.sh +++ b/.ci/script.sh @@ -26,9 +26,23 @@ elif [ "$LINT" = "file-encoding" ]; then for file in $(git diff --name-only HEAD master | grep .); do encoding=`file -bi $file | cut -f 2 -d";" | cut -f 2 -d=` - if [ ! $encoding = 'utf-8' ]; then - echo $file >> encoding_log - fi + case $encoding in + utf-8) + exit 0 + ;; + us-ascii) + exit 0 + ;; + cp936) + echo $file >> encoding_log + exit 2 + ;; + cp835) + echo $file >> encoding_log + exit 2 + esac + echo $file >> encoding_log + exit 2 done if [[ -s encoding_log ]]; then cat encoding_log diff --git a/README.md b/README.md index 079f770a9..8958843a4 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ [![Build Status](https://travis-ci.org/SpaceVim/SpaceVim.svg?branch=master)](https://travis-ci.org/SpaceVim/SpaceVim) [![Build status](https://ci.appveyor.com/api/projects/status/eh3t5oph70abp665/branch/master?svg=true)](https://ci.appveyor.com/project/wsdjeg/spacevim/branch/master) [![codecov](https://codecov.io/gh/SpaceVim/SpaceVim/branch/master/graph/badge.svg)](https://codecov.io/gh/SpaceVim/SpaceVim/branch/master) -![Version](https://img.shields.io/badge/version-1.2.0-8700FF.svg) +![Version](https://img.shields.io/badge/version-1.3.0--dev-8700FF.svg) [![GPLv3 License](https://img.shields.io/badge/license-GPLv3-blue.svg)](LICENSE) [![Doc](https://img.shields.io/badge/doc-%3Ah%20SpaceVim-orange.svg)](doc/SpaceVim.txt) diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim index 4a475ddff..8788daa86 100644 --- a/autoload/SpaceVim.vim +++ b/autoload/SpaceVim.vim @@ -43,7 +43,7 @@ scriptencoding utf-8 "" " Version of SpaceVim , this value can not be changed. -let g:spacevim_version = '1.2.0' +let g:spacevim_version = '1.3.0-dev' lockvar g:spacevim_version "" diff --git a/docs/cn/install.cmd b/docs/cn/install.cmd index cb4f2d29c..8ff8f0a48 100644 --- a/docs/cn/install.cmd +++ b/docs/cn/install.cmd @@ -11,7 +11,7 @@ echo " \______/| ##____/ \_______/\_______/\_______/ \_/ |__|__/ |__/ echo " | ## " echo " | ## " echo " |__/ " -echo " 版本 : 1.2.0 中文官网 : https://spacevim.org/cn/ " +echo " 鐗堟湰 : 1.2.0 涓枃瀹樼綉 : https://spacevim.org/cn/ " Push-Location ~ @@ -20,7 +20,7 @@ $repo_url = "https://github.com/SpaceVim/SpaceVim.git" $repo_name = "SpaceVim" $repo_path = "$HOME\.SpaceVim" -Function Pause ($Message = "请按任意按键继续 . . . ") { +Function Pause ($Message = "璇锋寜浠绘剰鎸夐敭缁х画 . . . ") { if ((Test-Path variable:psISE) -and $psISE) { $Shell = New-Object -ComObject "WScript.Shell" $Button = $Shell.Popup("Click OK to continue.", 0, "Script Paused", 0) @@ -31,48 +31,48 @@ Function Pause ($Message = " } } -echo "==> 开始检测环境依赖..." +echo "==> 寮濮嬫娴嬬幆澧冧緷璧..." echo "" sleep 1 -echo "==> 测试 git 命令" +echo "==> 娴嬭瘯 git 鍛戒护" if (Get-Command "git" -ErrorAction SilentlyContinue) { git version - echo "[OK] 测试成功. 开始下一个测试..." + echo "[OK] 娴嬭瘯鎴愬姛. 寮濮嬩笅涓涓祴璇..." sleep 1 } else { echo "" - echo "[ERROR] 无法在你的 PATH 中发现 'git.exe' 命令" - echo ">>> 准备退出......" + echo "[ERROR] 鏃犳硶鍦ㄤ綘鐨 PATH 涓彂鐜 'git.exe' 鍛戒护" + echo ">>> 鍑嗗閫鍑......" Pause exit } echo "" -echo "==> 测试 gvim 命令" +echo "==> 娴嬭瘯 gvim 鍛戒护" if (Get-Command "gvim" -ErrorAction SilentlyContinue) { echo ($(vim --version) -split '\n')[0] - echo "[OK] 测试成功. 开始下一个测试..." + echo "[OK] 娴嬭瘯鎴愬姛. 寮濮嬩笅涓涓祴璇..." sleep 1 } else { - echo "[WARNING] 无法在你的 PATH 中发现 'gvim.exe' 命令. 但仍可继续安装..." + echo "[WARNING] 鏃犳硶鍦ㄤ綘鐨 PATH 涓彂鐜 'gvim.exe' 鍛戒护. 浣嗕粛鍙户缁畨瑁..." echo "" - echo "[WARNING] 请后续安装 gvim 或者正确设置你的 PATH! " + echo "[WARNING] 璇峰悗缁畨瑁 gvim 鎴栬呮纭缃綘鐨 PATH! " Pause } -echo "<== 环境依赖检测已完成. 继续下一步..." +echo "<== 鐜渚濊禆妫娴嬪凡瀹屾垚. 缁х画涓嬩竴姝..." sleep 1 echo "" echo "" if (!(Test-Path "$HOME\.SpaceVim")) { - echo "==> 正在安装 $app_name" + echo "==> 姝e湪瀹夎 $app_name" git clone $repo_url $repo_path } else { - echo "==> 正在更新 $app_name" + echo "==> 姝e湪鏇存柊 $app_name" Push-Location $repo_path git pull origin master } @@ -80,32 +80,32 @@ if (!(Test-Path "$HOME\.SpaceVim")) { echo "" if (!(Test-Path "$HOME\vimfiles")) { cmd /c mklink $HOME\vimfiles $repo_path - echo "[OK] 已为 vim 安装 SpaceVim" + echo "[OK] 宸蹭负 vim 瀹夎 SpaceVim" sleep 1 } else { - echo "[OK] $HOME\vimfiles 已存在" + echo "[OK] $HOME\vimfiles 宸插瓨鍦" sleep 1 } echo "" if (!(Test-Path "$HOME\AppData\Local\nvim")) { cmd /c mklink "$HOME\AppData\Local\nvim" $repo_path - echo "[OK] 已为 neovim 安装 SpaceVim" + echo "[OK] 宸蹭负 neovim 瀹夎 SpaceVim" sleep 1 } else { - echo "[OK] $HOME\AppData\Local\nvim 已存在" + echo "[OK] $HOME\AppData\Local\nvim 宸插瓨鍦" sleep 1 } echo "" -echo "安装已完成!" +echo "瀹夎宸插畬鎴!" echo "==============================================================================" -echo "== 打开 Vim 或 Neovim,所有插件将会自动安装 ==" +echo "== 鎵撳紑 Vim 鎴 Neovim锛屾墍鏈夋彃浠跺皢浼氳嚜鍔ㄥ畨瑁 ==" echo "==============================================================================" echo "" -echo "感谢支持 SpaceVim,欢迎反馈!" +echo "鎰熻阿鏀寔 SpaceVim锛屾杩庡弽棣堬紒" echo "" Pause -# vim:set ft=ps1 nowrap: +# vim:set ft=powershell nowrap: diff --git a/docs/install.cmd b/docs/install.cmd index 60aad0412..9230e9f3c 100644 --- a/docs/install.cmd +++ b/docs/install.cmd @@ -11,7 +11,7 @@ echo " \______/| ##____/ \_______/\_______/\_______/ \_/ |__|__/ |__/ echo " | ## " echo " | ## " echo " |__/ " -echo " version : 1.2.0 by : spacevim.org " +echo " version : 1.3.0-dev by : spacevim.org " Push-Location ~ @@ -105,4 +105,4 @@ echo "" Pause -# vim:set ft=ps1: +# vim:set ft=powershell nowrap: diff --git a/docs/install.sh b/docs/install.sh index 53bdf93d7..67fc61d15 100755 --- a/docs/install.sh +++ b/docs/install.sh @@ -84,7 +84,7 @@ On_IWhite='\033[0;107m' # White # }}} # version -Version='1.2.0' +Version='1.3.0-dev' #System name System="$(uname -s)"