github
/
fhs-install-v2ray
mirror of https://github.com/v2fly/fhs-install-v2ray
1
0
Fork 0
Code Issues Releases Wiki Activity
261 Commits
2 Branches
0 Tags
475 KiB
Commit Graph

140 Commits (91dcfb2d5ff97a0721c349e1b2ed577b2812963d)

Author SHA1 Message Date
IceCodeNew ae19b89b93 Make output much easier to read. 2020-10-13 16:02:46 +08:00
IceCodeNew 7b5fe33c58 Propose a dead simple way to show systemd configuration 
while the local systemd version is too low to support `cat-config` function.
 2020-10-13 15:53:13 +08:00
IceCodeNew 994690f982 Revert "Replace `unzip` with `bsdtar`" 
This reverts commit 5573d7b6df.
 2020-10-13 15:37:50 +08:00
IceCodeNew 8ec8a258c3
Fix #161 (#162) 2020-10-12 14:34:51 +08:00
IceCodeNew 32d5d6e060 Introduce `systemd_cat_config` function 2020-10-02 20:57:44 +08:00
IceCodeNew ccd02ace75 `shfmt -i 2 -ci -sr` 2020-10-02 20:56:53 +08:00
IceCodeNew c1fb7038a1 Ignoring three specific instances. 2020-10-02 20:56:53 +08:00
IceCodeNew 50593bb31c fix SC2181 2020-10-02 20:56:53 +08:00
oxape 656fa81eb9 Match only whole word `v2ray` in systemd unit files. (#153) 
Also fix SC2143.

Co-authored-by: IceCodeNew <32576256+IceCodeNew@users.noreply.github.com>
Signed-off-by: IceCodeNew <32576256+IceCodeNew@users.noreply.github.com>
 2020-10-02 19:38:24 +08:00
IceCodeNew bd95556173 chore (better way to handle `PROXY` args) 
bash <(curl -L https://raw.githubusercontent.com/v2fly/fhs-install-v2ray/develop/install-release.sh) -p "http://95.174.67.50:18080"
手动测试通过（（（

Signed-off-by: IceCodeNew <32576256+IceCodeNew@users.noreply.github.com>
 2020-09-30 22:17:03 +08:00
IceCodeNew 5b92713370 Fix SC2162; shfmt -i 2 -ci -sr 
Signed-off-by: IceCodeNew <32576256+IceCodeNew@users.noreply.github.com>
 2020-09-30 19:27:10 +08:00
IceCodeNew 69aaf1981f Chore 
Signed-off-by: IceCodeNew <32576256+IceCodeNew@users.noreply.github.com>
 2020-09-30 19:27:10 +08:00
IceCodeNew 2894fc4e9a rm configuration file which could mess things up. 2020-09-30 18:23:22 +08:00
IceCodeNew 5573d7b6df Replace `unzip` with `bsdtar` 
The later is much faster and capable of supporting hundreds of compression file formats.
 2020-09-27 22:50:51 +08:00
kirin10000 5518635555 Place options ahead of command (#143) 2020-09-25 21:30:07 +08:00
IceCodeNew c40ab4a986 完善 `remove_v2ray` 函数 2020-09-25 16:53:24 +08:00
IceCodeNew 661312a9cc fix SC2120 2020-09-25 16:49:17 +08:00
IceCodeNew 62d33830da install package which provide `tput`; change function `install_software` 2020-09-25 16:43:55 +08:00
IceCodeNew 3540fe109c assume yes to remove action; sync repo while installing package 
Fix https://github.com/v2fly/fhs-install-v2ray/pull/141/checks?check_run_id=1164621937
 2020-09-25 15:56:39 +08:00
IceCodeNew 8e5c2e067f 修复在没有预装 `curl` 的系统上脚本会运行失败的问题 2020-09-25 15:33:02 +08:00
IceCodeNew c3ebd755b9 Introduce a more convenient way to detect systemd 
Refer: https://manpages.ubuntu.com/manpages/focal/en/man3/sd_booted.3.html
 2020-09-25 15:06:54 +08:00
IceCodeNew e574e2aacd switch from `command` to `type`; put `dnf` ahead of `yum`; assume yes 
0. command -v could return an alias while type -P will force a PATH search
1. There are distribution that has aliases for `apt` or `yum` while its prefer package manager is not `apt` nor ``yum
2. Assume yes for the call we made to all kind of package managers
 2020-09-25 00:22:34 +08:00
IceCodeNew ae9e64ff83 remove all the fancy but unnecessary args, as compatibility values most. 
https://github.com/v2fly/fhs-install-v2ray/issues/132#issuecomment-698350955
 2020-09-24 21:46:12 +08:00
IceCodeNew 2cf0c90b01 create function `curl`, instead of alias `curl` 
Try to fix #132.
> `-q`: Disable .curlrc
> `-L`: Follow redirects
> `--false-start`: Enable TLS False Start
> `--http2`: Use HTTP 2
> `--tlsv1.2`: Use TLSv1.2 or greater
 2020-09-24 21:40:16 +08:00
IceCodeNew b990f89b6e `shfmt -i 2 -ci -sr install-release.sh` 2020-09-24 16:40:26 +08:00
IceCodeNew 5c0bfb6532 Retry when transient error occurred 2020-09-24 15:38:59 +08:00
IceCodeNew 098244b343 Show download progress. 
Fix #128.
 2020-09-24 15:30:01 +08:00
ricuhkaen 99255e5281
typos in file path upon new config file(s) creation (#127) 
when new config.json gets created, the prompt should be "installed: /usr/local/etc/v2ray/config.json" instead of "installed: /usr/local/etc/v2rayconfig.json". (and similar typos for confdir)
 2020-09-22 22:01:34 +08:00
sunshineplan 4163816e8b Fix check proxy address (#125) 2020-09-21 16:40:19 +08:00
wind2008hxy aa6e6fb260
add support for archlinux package managers 2020-09-21 16:11:06 +08:00
IceCodeNew cbcaf9c5c1 bug fix for $114 
我 是 傻 逼
 2020-09-20 01:27:54 +08:00
IceCodeNew f0eacd1ca5 `shfmt -i 2 -ci` 2020-09-20 00:35:30 +08:00
IceCodeNew 3a14bbd46f Emit some colored notice. 2020-09-19 22:28:54 +08:00
IceCodeNew 6773934fa7 fix shell warning 2020-09-19 21:53:49 +08:00
IceCodeNew d4fe43b7c9 Create drop-in configurations for systemd unit files 2020-09-19 21:21:34 +08:00
东方有鱼名为咸 4a4f52a68c add user-agent (#111) 
Co-authored-by: IceCodeNew <32576256+IceCodeNew@users.noreply.github.com>
 2020-09-19 19:06:28 +08:00
xiagw cbf08bdb26 fix function get_versionchange to if -n,reduce indent 2020-09-19 19:02:29 +08:00
xiagw f607e17837 fix1: fix function judgment_parameters (#104) 
Co-authored-by: IceCodeNew <32576256+IceCodeNew@users.noreply.github.com>
 2020-09-19 19:02:28 +08:00
xiagw d41ead065b
fix2: fix function install_software (#105) 2020-09-19 16:28:36 +08:00
IceCodeNew a9498beff0
Merge pull request #108 from xiagw/install-release-fix5 
fix5: fix function start_v2ray
 2020-09-19 16:11:42 +08:00
xiagw ea2fc97a31
fix5: fix function start_v2ray 2020-09-17 17:49:20 +07:00
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