Commit Graph

286 Commits (master)

Author SHA1 Message Date
Dct Mei 828c8b28a0
Merge pull request #30 from v2fly/develop
fix: Incorrect execution of stop_v2ray function
2020-07-26 15:41:39 +00:00
Dct Mei d72aa48586
fix: Incorrect execution of stop_v2ray function
1. In the first installation, if there happens to be a V2Ray service that is not managed by systemd, or if there is a judgment error, the stop_v2ray function will be executed incorrectly, which will cause the installation to fail.

issue #29
2020-07-26 23:02:15 +08:00
Dct Mei 422f3873bd
Merge pull request #28 from v2fly/develop
fix: Permission control of the log folder
2020-07-25 09:18:44 +00:00
Dct Mei b09dd49446
fix: Permission control of the log folder 2020-07-25 17:15:16 +08:00
Dct Mei 2741bc1599
Merge pull request #27 from v2fly/develop
style: Add a symbol
2020-07-14 02:33:45 +00:00
Dct Mei 238469c303
style: Add a symbol 2020-07-14 10:32:05 +08:00
Dct Mei 29a7f46e39
Merge pull request #26 from v2fly/develop
Added new Wiki for #20
2020-07-14 02:29:50 +00:00
Dct Mei 08487ddca5
feat: Added new Wiki
For #20
2020-07-14 10:26:23 +08:00
Dct Mei 8001d4ec59
style: Double quotes changed to single quotes
The unified format is very important.
2020-07-14 10:17:37 +08:00
Dct Mei 730a24c79f
Merge pull request #25 from v2fly/develop
Merge branches to solve #20
2020-07-14 02:10:31 +00:00
Dct Mei d982eaf355
feat: It is feasible to not install or update geoip.dat and geosite.dat
issue #20
2020-07-14 09:57:44 +08:00
Dct Mei a2bd3852e4
Revert "Make scripts more compatible and fail fast"
This reverts commit cf8dab851f.

This affects the normal operation of the script, and debugging should be done deliberately, not to the user.
2020-07-13 00:56:56 +08:00
Dct Mei feaf4e2522
Merge pull request #23 from Loyalsoldier/refine-script
Make scripts more compatible and fail fast
2020-07-11 10:49:44 +00:00
loyalsoldier cf8dab851f
Make scripts more compatible and fail fast 2020-07-11 18:25:10 +08:00
Dct Mei ca6e20b1d8
Merge pull request #22 from v2fly/develop
fix: Dealing with errors in service judgment
2020-07-10 23:38:28 +00:00
Dct Mei 9e23002a71
fix: Determine whether to use v2ray@ and make corresponding instruction execution
1. The modification plan has not yet been tried...
2. https://raw.githubusercontent.com/v2fly/fhs-install-v2ray/develop/install-release.sh
2020-07-11 07:07:03 +08:00
Dct Mei 86b6abcdf1
Merge pull request #15 from v2fly/develop
style: Wiki special classification
2020-06-14 03:31:13 +00:00
Dct Mei 1195b2ccca
style: The problem is not a problem 2020-06-14 11:29:45 +08:00
Dct Mei 81c5567433
style: Try the correction again 2020-06-14 11:23:55 +08:00
Dct Mei ed0b98e1b7
style: Try to fix again 2020-06-14 11:17:33 +08:00
Dct Mei 318f73efbe
style: Add 1 spaces 2020-06-14 11:10:09 +08:00
Dct Mei 187bf100f2
style: Remove 2 spaces 2020-06-14 11:00:57 +08:00
Dct Mei e73c5d5a42
style: Add two spaces 2020-06-14 10:57:14 +08:00
Dct Mei eb17412bb6
style: Wiki special classification
Separate problem solutions.
2020-06-14 10:48:48 +08:00
Dct Mei 52f52dba0e
Merge pull request #14 from v2fly/develop
feat: Description of permissions
2020-06-14 02:38:01 +00:00
Dct Mei d7330b7183
style: Artificial regulation 2020-06-14 10:36:25 +08:00
Dct Mei c4fb336e06
style: Content differentiation 2020-06-14 10:30:56 +08:00
Dct Mei 1ec6b3026d
style: Fix a missing error 2020-06-14 10:28:08 +08:00
Dct Mei 490ab188ef
style: Try to pass the test 2020-06-14 10:24:04 +08:00
Dct Mei 31ad6c875c
style: Small format adjustment
Two plans have been established for the problem of insufficient authority when using certificates.
2020-06-14 09:55:57 +08:00
Dct Mei 97f1ec93e2
feat: Permission issues for certificate use
Supplement and explanation for the problem of insufficient authority for certificate use.
2020-06-14 09:38:28 +08:00
Kslr dc9809d62d
Merge pull request #13 from IceCodeNew/develop
Make curl silence again.
2020-06-14 01:37:07 +08:00
IceCodeNew fb1cc7f6e7 Make curl silence again. 2020-06-13 23:52:05 +08:00
Dct Mei a05206b2bb
Merge pull request #12 from v2fly/develop
feat: Branch merge
2020-06-13 13:03:12 +00:00
Dct Mei 38da8a7b93
style: Canonical code format
1. Regulate two judgments, this will not cause functional changes.
2. Add some supplementary content, mainly for subsequent maintenance.
2020-06-13 20:44:22 +08:00
Dct Mei cbec4d92e0
Merge pull request #5 from tzwjkl/master
Remove unnecessary permission changes, add pre judgment for root uid.
2020-06-13 07:14:27 +00:00
tzwjkl 1ec9723760
Merge pull request #2 from v2fly/master
Up to date from Origin
2020-06-13 09:30:59 +08:00
Kslr 298835c945
Merge pull request #10 from IceCodeNew/4pr
Bug fix. Also implied some ShellCheck fixes.
2020-06-12 16:20:09 +08:00
IceCodeNew 56f37614f4 Fix wrongly handling proxy parameters given to curl
巧了,正好是我手贱把原来好好的 curl 参数顺序调乱了搞得脚本不指定代理就无法正常工作。
结果我意外因为这个发现脚本原本写的提供给 curl 的代理参数多了个空格,所以原来脚本是给了代理参数就不能正常工作的(

---

` curl '-x socks5h://1.1.1.1:9999' https://ipinfo.io `
> curl: (5) Unsupported proxy syntax in ' socks5h://1.1.1.1:9999'

注意这里报错消息里的空格。
2020-06-12 12:56:53 +08:00
IceCodeNew a0bb5d8eed Only implied some ShellCheck fixes.
添上了必要的引号,同时手动修复了 [SC2181](https://github.com/koalaman/shellcheck/wiki/SC2181) 错误。
2020-06-12 12:54:36 +08:00
tzwjkl b92ed1985b fix install mode parameter 2020-06-11 15:35:50 +08:00
tzwjkl 8699dd7db5
Merge pull request #1 from v2fly/master
Up to date from Origin.
2020-06-11 14:44:07 +08:00
Kslr 6b2b81593f
Merge pull request #9 from phlinhng/master
modified the upstream from v2ray/v2ray-core to v2fly/v2ray-core
2020-06-11 11:49:19 +08:00
phlinhng 511a685bff
upstream: v2ray -> v2fly 2020-06-10 20:01:54 +08:00
tzwjkl 9bfbc5df76 Add Comments for check_if_running_as_root() 2020-06-08 04:20:43 +08:00
tzwjkl 4488a5c20b Add root uid judgment before running 2020-06-08 03:38:51 +08:00
tzwjkl a0a1c5af20 Remove unnecessary permission changes. 2020-06-06 15:29:44 +08:00
Nicholas Wang e917483e9a
checksum verification fix 2020-06-01 20:50:02 -05:00
Dct Mei 8711429d48
style: Remove the # parameter of the bad experience of cURL
When using this parameter, multiple progress bars are prone to appear.
2020-04-30 09:56:05 +08:00
Dct Mei 95020aa14d
fix: Extra files
After executing install, two redundant .new files will be left out, which should be removed.
2020-04-29 15:05:10 +08:00