Commit Graph

149 Commits (develop)

Author SHA1 Message Date
xiagw dc7d1fe174
fix mktemp -du to mktem -d 2020-09-17 17:27:18 +07:00
Kslr 4706d8e46c
copy systemd file from the package 2020-09-06 15:17:43 +08:00
IceCodeNew 94ae72d399 Add `systemctl daemon-reload`
necessary for updating systemd unit files.
2020-09-05 11:06:48 +08:00
IceCodeNew 2235098bc6 Update systemd unit files every time the script is executed
脚本安装 systemd unit files 的行为很快会改为从最新的 v2ray-core release
中取得文件。
考虑到这些文件未来会有随 v2ray-core 新版本发布而更新的可能,所以提前做出这样的调整。
2020-09-05 10:40:11 +08:00
IceCodeNew 5d471592fd Unalias crucial functions when issuing them
for preventing user-custom aliases interupt script
2020-09-05 10:29:31 +08:00
IceCodeNew 55fe32f505 移除路径变量末尾的斜杠
我个人更倾向于这样的风格,一方面我认为路径变量就应该使用目录的名字,而既然目录名里不会有 `/`,那所以变量里也不应该带。
另一方面我是真的担心会出现转义导致的问题,一个目录不可能以 `/` 结尾,但可以以 `\` 结尾。变量名里保证不去多此一举加上 `/` 的话,对于 `ugly\` 这样的目录名,我们就可以在之后用到这个变量的时候再来处理转义问题,而不需要对着变量值 `ugly\/` 头疼。
2020-09-05 10:14:36 +08:00
IceCodeNew 639d31a791 Merge remote-tracking branch 'origin/develop' into master 2020-08-18 22:17:54 +08:00
phlinhng c11c2282ef
create systemd locally
create systemd locally

fix typo; match coding style

modify json path

fix typo; match coding style

modify json path

modify messages

fix typo in path

switch back to single config

fix typo

fix typo

fix typo
2020-08-18 20:35:05 +08:00
Nicholas Wang 4554467c03
remove silent flag for cURL calls 2020-08-17 04:24:07 -05:00
Dct Mei 46ccbf0bd8
fix: Missing Log Source
1. Now, the initialization of the Log file is normal.
2. And, some new related outputs have been added.
2020-08-15 19:52:53 +08:00
Dct Mei e6bd2e5f21
fix: A wrong installation path
1. Move the .dat file from the lib directory to the share directory.

issue #17
2020-08-15 16:55:02 +08:00
Dct Mei 9b090f80f9
fix: Initialize log file permissions
1. It seems that someone will run V2Ray directly through commands instead of systemd first, which will cause wrong Log file permissions and affect subsequent systemd operations.

issue #38
2020-08-14 20:58:22 +08:00
Dct Mei c5d661fca6
feat: Add variables to modify the installation path
1. $DAT_PATH can be modified to /usr/local/share/v2ray/ .
2. $JSON_PATH can be modified to /etc/v2ray/ .
3. However, after modification, you need to modify the unit file yourself.
2020-08-12 11:15:37 +08:00
IceCodeNew 83105f93d3 Add warning. 2020-08-08 11:20:15 +08:00
Dct Mei d6808a3ddb fix: Adapt v4.27.0
1. Modify MACHINE.
2. Add riscv64 for MACHINE.
2020-08-08 11:17:35 +08:00
IceCodeNew d63e0e4cd8 Fix issue #33
我手上没有 armv5 的设备,Google `linux "armv5" "uname"` 找到了一个 `uname -m` 的输出 `armv5tel`,这也出现在 fedora 的发行历史页上,所以我判定选择这个是安全的。
欢迎补充我遗漏的架构名。
2020-08-08 10:28:39 +08:00
Dct Mei 823d8b644d
fix: Changed from pgrep to pidof
1. Resolve incorrect matching issues.

issue #29
2020-07-27 01:04:53 +08: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 b09dd49446
fix: Permission control of the log folder 2020-07-25 17:15:16 +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 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
loyalsoldier cf8dab851f
Make scripts more compatible and fail fast 2020-07-11 18:25:10 +08: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 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
tzwjkl 1ec9723760
Merge pull request #2 from v2fly/master
Up to date from Origin
2020-06-13 09:30:59 +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
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
12bbf7608ae1 219bb4480c
Update install-release.sh
Modify for Raspbian on Raspberry Pi.
2020-04-24 00:33:25 +08:00
Dct Mei 65fc443163
Change to function 2020-04-17 00:09:54 +08:00
Dct Mei 45f823dd06
Modify the order of output content 2020-04-12 12:18:11 +08:00
Dct Mei f30b149b6d
Correct the output 2020-04-12 11:57:44 +08:00
Dct Mei 6effa0a0da
The script should not involve data updates of package management software 2020-04-12 11:34:35 +08:00
Dct Mei e3f730b2fb
Parameter identification and correction 2020-04-12 11:22:09 +08:00
Dct Mei 47f73bf301
Canonical function naming 2020-04-12 11:01:38 +08:00
Dct Mei e6d16bc69d
Modify the location of the output 2020-04-11 22:52:15 +08:00
Dct Mei 5572d2bae8
More precise content 2020-04-11 22:03:00 +08:00
Dct Mei 728d019892
Adjust the content of the variable 2020-04-11 21:17:37 +08:00
Dct Mei 671ef064d6
Minor adjustment 2020-04-11 20:58:07 +08:00
Dct Mei 025993ece6
Modify judgment content 2020-04-11 18:41:39 +08:00
Dct Mei 5e306971ff
Fix a wrong instruction 2020-04-11 14:44:51 +08:00
Dct Mei 3a221f7bfd
Fix the problem of unable to proxy download 2020-04-11 01:32:49 +08:00
Dct Mei 2778c87a03
Correction path 2020-04-10 21:44:46 +08:00
Dct Mei 8a2f69729f
Remove support for Alpine Linux and correct judgment 2020-04-10 21:29:26 +08:00
Dct Mei 08559e320d
Support Alpine Linux 2020-04-10 21:03:03 +08:00
Dct Mei 3a5008e566
Fix local installation errors 2020-03-29 18:02:58 +08:00
Dct Mei 74f47ff8de
Determine the contents of the modular configuration file 2020-03-29 17:11:23 +08:00
Dct Mei 8c5d16c224
Change strategy 2020-03-29 14:47:30 +08:00
Dct Mei 87d0b17e4f
Revised again 2020-03-29 14:43:42 +08:00
Dct Mei 879e3b7f8d
Modify the content 2020-03-29 14:37:30 +08:00
Dct Mei c1c95f0400
Revised output 2020-03-29 14:04:47 +08:00
Dct Mei 070747d543
Remove unwanted content 2020-03-29 14:02:27 +08:00
Dct Mei 0a4d5782ea
Modular configuration file 2020-03-29 13:55:10 +08:00
Dct Mei a54bf41ae7
Modify the installation method of the configuration file 2020-03-27 13:50:29 +08:00
Dct Mei dccc5039de
Change installation strategy #2328#issuecomment-604246679 2020-03-26 15:51:26 +08:00
Dct Mei ac0ac01635
Fix the error again 2020-03-25 22:12:42 +08:00
Dct Mei 5ac5084ffe
Revision error 2020-03-25 22:05:40 +08:00
Dct Mei 9000338db2
Add missing content 2020-03-25 21:51:16 +08:00
Dct Mei b1b6900629
New startup service file 2020-03-25 21:40:40 +08:00
Dct Mei 87e11835d6
Symbol revision 2020-03-25 15:24:49 +08:00
Dct Mei 0a87b33e41
Determine whether the package management of the operating system is DNF 2020-03-25 13:26:18 +08:00
Dct Mei a2704fb985
Change removal order 2020-03-25 00:09:20 +08:00
Dct Mei 6ce5832fea
Fix the omissions again 2020-03-24 23:50:30 +08:00
Dct Mei fd368bec01
Fix missing 2020-03-24 19:46:44 +08:00
Dct Mei f8143255e1
Revise 2020-03-24 19:31:04 +08:00
Dct Mei 62cfaac56f
Judge systemd 2020-03-24 19:21:13 +08:00
Dct Mei cb0fa9fde1
Ready to use 2020-03-24 19:11:32 +08:00
Dct Mei 3eebcdcb2e
Resolving errors 2020-03-24 17:32:49 +08:00
Dct Mei 45996c6929
Little try 2020-03-24 16:49:52 +08:00
Dct Mei b37ee5165d
add notes 2020-03-24 16:31:06 +08:00
Dct Mei a60fd77416
Avoid errors when installing cURL for the first time 2020-03-24 16:16:14 +08:00
Dct Mei ba87730c26
Avoid getting wrong results 2020-03-24 15:46:43 +08:00
Dct Mei d9f6d03e67
Fix support types 2020-03-24 15:12:41 +08:00
Dct Mei 9f001bab45
Judgment Package Management 2020-03-24 15:03:22 +08:00
Dct Mei 20441d38bc
Eliminate wrong nouns 2020-03-24 02:37:03 +08:00
Dct Mei 51f42e47ba
Try to fix the error 2020-03-24 02:28:53 +08:00
Dct Mei f7cf4908e5
Eliminate meaningless symbols 2020-03-24 02:12:22 +08:00
Dct Mei b6de829103
Correct the wrong variable again 2020-03-24 02:08:35 +08:00
Dct Mei 2167d99c2e
Fixing wrong variables 2020-03-24 02:02:51 +08:00
Dct Mei 37f2a0c3a0
Modify arch to uname 2020-03-24 01:56:52 +08:00
Dct Mei 1cb3498ce2
Fix bad validation 2020-03-23 21:49:03 +08:00
Dct Mei a03315b808
Remove wrong instructions 2020-03-23 21:45:45 +08:00
Dct Mei 3c8a4f4275
Instruction correction 2020-03-23 21:36:26 +08:00
Dct Mei 2ebf45a42e
Complete refactoring 2020-03-23 21:28:20 +08:00
Dct Mei 0f6a12888b
fix sed 2020-03-16 15:32:27 +08:00
Dct Mei 4b7faf1d11
try to modify the check instruction 2020-03-16 15:27:52 +08:00
Dct Mei 2278203c14
correct check code instruction 2020-03-16 15:21:23 +08:00
Dct Mei 33da3e507e
content revision 2020-03-16 15:15:02 +08:00
Dct Mei adb98974f0
correction path 2020-03-16 14:17:07 +08:00
Dct Mei 45166a3258
fix missing 2020-03-12 13:34:19 +08:00
Dct Mei 76f1bf9620
installation script modified according to fhs standard 2020-03-12 13:29:01 +08:00