Update install-release.sh #350
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Current coverage is 68.49% (diff: 100%)@@ master #350 diff @@
==========================================
Files 168 168
Lines 9341 9231 -110
Methods 0 0
Messages 0 0
Branches 0 0
==========================================
+ Hits 6306 6323 +17
+ Misses 2415 2282 -133
- Partials 620 626 +6
|
v2ray
suggested changes
Jan 1, 2017
| ############################### | ||
| colorEcho(){ | ||
| color=$1 | ||
| text=$2 |
| if [[ $SOFTWARE_UPDATED -eq 0 ]]; then | ||
| colorEcho ${wblue} "Updating software repo" | ||
| $CMD_UPDATE | ||
| if [[ $? -ne 0 ]]; then |
There was a problem hiding this comment.
这个检查似乎没什么意义，即使更新失败，也可能可以安装软件。
There was a problem hiding this comment.
想了想好像还真是这样，而且一般 update 也不会出错
| echo " -h, --help Show help" | ||
| echo " -p, --proxy To download through a proxy server, use -p socks5:https://127.0.0.1:1080 or -p http:https://127.0.0.1:3128 etc" | ||
| echo " -f, --force Force install" | ||
| echo " -v, --version Install a particular version" |
There was a problem hiding this comment.
'-v' 通常是指 verbose，最好不要用于其它的指令
| echo " -f, --force Force install" | ||
| echo " -v, --version Install a particular version" | ||
| echo " -l, --local Install from a local file" | ||
| echo " -r, --remove Remove installed V2Ray" |
| if pgrep "v2ray" > /dev/null ; then | ||
| stopV2ray | ||
| fi | ||
| rm -rf "/usr/lib/v2ray" "/lib/systemd/system/v2ray.service" |
There was a problem hiding this comment.
删 service 之前应该要先 disable service，另外还有 sysv 的 service。
|
针对你提出的问题作了相应修改 |
v2ray
suggested changes
Jan 5, 2017
| stopV2ray | ||
| fi | ||
| systemctl disable v2ray.service | ||
| rm -rf "/usr/lib/v2ray" "/lib/systemd/system/v2ray.service" |
There was a problem hiding this comment.
这里应该是 /usr/bin/ 而不是 /usr/lib，下同。
|
应该没什么问题，最后一个 commet 改好就 merge。不过最新的 go.sh 实际上不是这个文件，之后我自己同步一下好了。 |
|
修改完成 |
|
非常感谢 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
花了点时间写了个脚本，在 Debian 8、Debian testing、 Ubuntu 14.04 测试无问题。主要变化：