From c3100c3f252c6ed23eca5fa7262581615491a578 Mon Sep 17 00:00:00 2001 From: Dct Mei Date: Sat, 11 Apr 2020 10:46:25 +0000 Subject: [PATCH 01/33] Initial commit --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From e9b0793779a72893976651764675efff65ad29d6 Mon Sep 17 00:00:00 2001 From: Dct Mei Date: Sat, 11 Apr 2020 18:53:37 +0800 Subject: [PATCH 02/33] Testable --- README.md | 13 ++++++ init.d/v2ray | 34 +++++++++++++++ install-release.sh | 101 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 148 insertions(+) create mode 100644 README.md create mode 100644 init.d/v2ray create mode 100644 install-release.sh diff --git a/README.md b/README.md new file mode 100644 index 0000000..79c0818 --- /dev/null +++ b/README.md @@ -0,0 +1,13 @@ +# alpinelinux-install-v2ray + +## 下載 + +``` +$ curl -O https://raw.githubusercontent.com/v2fly/fhs-install-v2ray/master/install-release.sh +``` + +## 使用 + +``` +# ash install-release.sh +``` diff --git a/init.d/v2ray b/init.d/v2ray new file mode 100644 index 0000000..ea1cd3f --- /dev/null +++ b/init.d/v2ray @@ -0,0 +1,34 @@ +#!/sbin/openrc-run + +name="V2Ray" +description="A platform for building proxies to bypass network restrictions" +description_checkconfig="Verify configuration file" + +: ${confdir:="/usr/local/etc/v2ray/"} +: ${env:="V2RAY_LOCATION_ASSET=/usr/local/lib/v2ray/"} + +command="/usr/local/bin/v2ray" +command_args="-confdir $confdir" +command_user="nobody" + +pidfile="/run/v2ray.pid" +command_background="yes" + +extra_commands="checkconfig" + +depend() { + need net +} + +checkconfig() { + if [ ! -d "$confdir" ] ; then + eerror "You need to setup $confdir first" + return 1 + fi + $command -test $command_args +} + +start_pre() { + export $env + checkconfig +} diff --git a/install-release.sh b/install-release.sh new file mode 100644 index 0000000..4ef13ce --- /dev/null +++ b/install-release.sh @@ -0,0 +1,101 @@ +#!/bin/ash + +# Judge architecture +case "$(arch -s)" in + 'i386' | 'i686') + BIT='32' + ;; + 'amd64' | 'x86_64') + BIT='64' + ;; + *) + echo "error: The architecture is not supported." + exit 1 + ;; +esac + +if [[ "$(command -v apk)" ]]; then + apk update + apk add curl unzip +else + echo "error: The script does not support the package manager in this operating system." + exit 1 +fi + +TMP_DIRECTORY="$(mktemp -d)/" +ZIP_FILE="${TMP_DIRECTORY}v2ray-linux-$BIT.zip" +DOWNLOAD_LINK="https://github.com/v2ray/v2ray-core/releases/latest/download/v2ray-linux-$BIT.zip" + +curl -L -H 'Cache-Control: no-cache' -o "$ZIP_FILE" "$DOWNLOAD_LINK" -# +if [[ "$?" -ne '0' ]]; then + echo 'error: Download failed! Please check your network or try again.' + exit 1 +fi +curl -L -H 'Cache-Control: no-cache' -o "$ZIP_FILE.dgst" "$DOWNLOAD_LINK.dgst" -# +if [[ "$?" -ne '0' ]]; then + echo 'error: Download failed! Please check your network or try again.' + return 1 +fi + +if [[ "$(cat $ZIP_FILE.dgst)" == 'Not Found' ]]; then + echo 'error: This version does not support verification. Please replace with another version.' + return 1 +fi +# Verification of V2Ray archive +for LISTSUM in 'md5' 'sha1' 'sha256' 'sha512'; do + SUM="$(${LISTSUM}sum $ZIP_FILE | sed 's/ .*//')" + CHECKSUM="$(grep $(echo $LISTSUM | tr [:lower:] [:upper:]) $ZIP_FILE.dgst | sed 's/.* //')" + if [[ "$SUM" != "$CHECKSUM" ]]; then + echo 'error: Check failed! Please check your network or try again.' + return 1 + fi +done + +unzip -q "$ZIP_FILE" -d "$TMP_DIRECTORY" + +install -m 755 "${TMP_DIRECTORY}v2ray" "/usr/local/bin/v2ray" +install -m 755 "${TMP_DIRECTORY}v2ctl" "/usr/local/bin/v2ctl" +install -d /usr/local/lib/v2ray/ +install -m 755 "${TMP_DIRECTORY}geoip.dat" "/usr/local/lib/v2ray/geoip.dat" +install -m 755 "${TMP_DIRECTORY}geosite.dat" "/usr/local/lib/v2ray/geosite.dat" +if [[ ! -d '/usr/local/etc/v2ray/' ]]; then + install -d /usr/local/etc/v2ray/ + for BASE in 00_log 01_api 02_dns 03_routing 04_policy 05_inbounds 06_outbounds 07_transport 08_stats 09_reverse; do + echo '{}' > "/usr/local/etc/v2ray/$BASE.json" + done +fi +if [[ ! -d '/var/log/v2ray/' ]]; then + if [[ -n "$(id nobody | grep nogroup)" ]]; then + install -d -o nobody -g nogroup /var/log/v2ray/ + else + install -d -o nobody -g nobody /var/log/v2ray/ + fi +fi +if [[ ! -f '/etc/systemd/system/v2ray.service' ]]; then + mkdir "${TMP_DIRECTORY}init.d/" + curl -o "${TMP_DIRECTORY}init.d/v2ray" https://raw.githubusercontent.workers.dev/v2fly/alpinelinux-install-v2ray/master/init.d/v2ray -s + if [[ "$?" -ne '0' ]]; then + echo 'error: Failed to start service file download! Please check your network or try again.' + exit 1 + fi + install -m 755 "${TMP_DIRECTORY}init.d/v2ray" /etc/init.d/v2ray +fi + +rm -r "$TMP_DIRECTORY" + +echo 'installed: /usr/local/bin/v2ray' +echo 'installed: /usr/local/bin/v2ctl' +echo 'installed: /usr/local/lib/v2ray/geoip.dat' +echo 'installed: /usr/local/lib/v2ray/geosite.dat' +echo 'installed: /usr/local/etc/v2ray/00_log.json' +echo 'installed: /usr/local/etc/v2ray/01_api.json' +echo 'installed: /usr/local/etc/v2ray/02_dns.json' +echo 'installed: /usr/local/etc/v2ray/03_routing.json' +echo 'installed: /usr/local/etc/v2ray/04_policy.json' +echo 'installed: /usr/local/etc/v2ray/05_inbounds.json' +echo 'installed: /usr/local/etc/v2ray/06_outbounds.json' +echo 'installed: /usr/local/etc/v2ray/07_transport.json' +echo 'installed: /usr/local/etc/v2ray/08_stats.json' +echo 'installed: /usr/local/etc/v2ray/09_reverse.json' +echo 'installed: /var/log/v2ray/' +echo 'installed: /etc/init.d/v2ray' From ee1ded58863d0655ac7f6d2758d435709942f9f4 Mon Sep 17 00:00:00 2001 From: Dct Mei Date: Sat, 11 Apr 2020 19:09:39 +0800 Subject: [PATCH 03/33] Add description --- README.md | 32 ++++++++++++++++++++++++++++++++ init.d/v2ray | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 79c0818..75fabff 100644 --- a/README.md +++ b/README.md @@ -11,3 +11,35 @@ $ curl -O https://raw.githubusercontent.com/v2fly/fhs-install-v2ray/master/insta ``` # ash install-release.sh ``` + +## 管理指令 + +### 啟用 + +``` +# rc-update add v2ray +``` + +### 禁用 + +``` +# rc-update del v2ray +``` + +### 啟動 + +``` +# rc-service v2ray start +``` + +### 關閉 + +``` +# rc-service v2ray stop +``` + +### 重啟 + +``` +# rc-service v2ray restart +``` diff --git a/init.d/v2ray b/init.d/v2ray index ea1cd3f..6eec620 100644 --- a/init.d/v2ray +++ b/init.d/v2ray @@ -29,6 +29,6 @@ checkconfig() { } start_pre() { - export $env + local $env checkconfig } From ceaad674fe99871eb85ec66024913118b4a7402c Mon Sep 17 00:00:00 2001 From: Dct Mei Date: Sat, 11 Apr 2020 19:12:25 +0800 Subject: [PATCH 04/33] Instruction revision --- install-release.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install-release.sh b/install-release.sh index 4ef13ce..11b8146 100644 --- a/install-release.sh +++ b/install-release.sh @@ -34,12 +34,12 @@ fi curl -L -H 'Cache-Control: no-cache' -o "$ZIP_FILE.dgst" "$DOWNLOAD_LINK.dgst" -# if [[ "$?" -ne '0' ]]; then echo 'error: Download failed! Please check your network or try again.' - return 1 + exit 1 fi if [[ "$(cat $ZIP_FILE.dgst)" == 'Not Found' ]]; then echo 'error: This version does not support verification. Please replace with another version.' - return 1 + exit 1 fi # Verification of V2Ray archive for LISTSUM in 'md5' 'sha1' 'sha256' 'sha512'; do @@ -47,7 +47,7 @@ for LISTSUM in 'md5' 'sha1' 'sha256' 'sha512'; do CHECKSUM="$(grep $(echo $LISTSUM | tr [:lower:] [:upper:]) $ZIP_FILE.dgst | sed 's/.* //')" if [[ "$SUM" != "$CHECKSUM" ]]; then echo 'error: Check failed! Please check your network or try again.' - return 1 + exit 1 fi done From 02665a2a92ea51778aa19571deb6f92d62957532 Mon Sep 17 00:00:00 2001 From: Dct Mei Date: Sat, 11 Apr 2020 19:14:10 +0800 Subject: [PATCH 05/33] Fix wrong content --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 75fabff..adfcb43 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## 下載 ``` -$ curl -O https://raw.githubusercontent.com/v2fly/fhs-install-v2ray/master/install-release.sh +$ curl -O https://raw.githubusercontent.com/v2fly/alpinelinux-install-v2ray/master/install-release.sh ``` ## 使用 From cb0844789f62d3d7adc7cabd3ec5c5d1f4295463 Mon Sep 17 00:00:00 2001 From: Dct Mei Date: Sat, 11 Apr 2020 19:19:53 +0800 Subject: [PATCH 06/33] Fix environment variables --- init.d/v2ray | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.d/v2ray b/init.d/v2ray index 6eec620..ea1cd3f 100644 --- a/init.d/v2ray +++ b/init.d/v2ray @@ -29,6 +29,6 @@ checkconfig() { } start_pre() { - local $env + export $env checkconfig } From d6f94e178e3c1df0d29a2ee69b2ff15802467137 Mon Sep 17 00:00:00 2001 From: Dct Mei Date: Sat, 11 Apr 2020 19:21:21 +0800 Subject: [PATCH 07/33] Correct variable location --- init.d/v2ray | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.d/v2ray b/init.d/v2ray index ea1cd3f..911fe8a 100644 --- a/init.d/v2ray +++ b/init.d/v2ray @@ -25,10 +25,10 @@ checkconfig() { eerror "You need to setup $confdir first" return 1 fi + export $env $command -test $command_args } start_pre() { - export $env checkconfig } From ccefbe7231695e1e7bd327d244ad3ee7df6d7d67 Mon Sep 17 00:00:00 2001 From: Dct Mei Date: Sat, 11 Apr 2020 20:59:45 +0800 Subject: [PATCH 08/33] Content adjustment --- init.d/v2ray | 6 ++--- install-release.sh | 55 +++++++++++++++++++++++----------------------- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/init.d/v2ray b/init.d/v2ray index 911fe8a..e44ccca 100644 --- a/init.d/v2ray +++ b/init.d/v2ray @@ -2,10 +2,10 @@ name="V2Ray" description="A platform for building proxies to bypass network restrictions" -description_checkconfig="Verify configuration file" +description_checkconfig="Test configuration file" -: ${confdir:="/usr/local/etc/v2ray/"} : ${env:="V2RAY_LOCATION_ASSET=/usr/local/lib/v2ray/"} +: ${confdir:="/usr/local/etc/v2ray/"} command="/usr/local/bin/v2ray" command_args="-confdir $confdir" @@ -21,7 +21,7 @@ depend() { } checkconfig() { - if [ ! -d "$confdir" ] ; then + if [ ! -d "$confdir" ]; then eerror "You need to setup $confdir first" return 1 fi diff --git a/install-release.sh b/install-release.sh index 11b8146..da3b869 100644 --- a/install-release.sh +++ b/install-release.sh @@ -14,7 +14,7 @@ case "$(arch -s)" in ;; esac -if [[ "$(command -v apk)" ]]; then +if [ "$(command -v apk)" ]; then apk update apk add curl unzip else @@ -27,20 +27,16 @@ ZIP_FILE="${TMP_DIRECTORY}v2ray-linux-$BIT.zip" DOWNLOAD_LINK="https://github.com/v2ray/v2ray-core/releases/latest/download/v2ray-linux-$BIT.zip" curl -L -H 'Cache-Control: no-cache' -o "$ZIP_FILE" "$DOWNLOAD_LINK" -# -if [[ "$?" -ne '0' ]]; then +if [ "$?" -ne '0' ]; then echo 'error: Download failed! Please check your network or try again.' exit 1 fi curl -L -H 'Cache-Control: no-cache' -o "$ZIP_FILE.dgst" "$DOWNLOAD_LINK.dgst" -# -if [[ "$?" -ne '0' ]]; then +if [ "$?" -ne '0' ]; then echo 'error: Download failed! Please check your network or try again.' exit 1 fi -if [[ "$(cat $ZIP_FILE.dgst)" == 'Not Found' ]]; then - echo 'error: This version does not support verification. Please replace with another version.' - exit 1 -fi # Verification of V2Ray archive for LISTSUM in 'md5' 'sha1' 'sha256' 'sha512'; do SUM="$(${LISTSUM}sum $ZIP_FILE | sed 's/ .*//')" @@ -58,20 +54,18 @@ install -m 755 "${TMP_DIRECTORY}v2ctl" "/usr/local/bin/v2ctl" install -d /usr/local/lib/v2ray/ install -m 755 "${TMP_DIRECTORY}geoip.dat" "/usr/local/lib/v2ray/geoip.dat" install -m 755 "${TMP_DIRECTORY}geosite.dat" "/usr/local/lib/v2ray/geosite.dat" -if [[ ! -d '/usr/local/etc/v2ray/' ]]; then +if [ ! -d '/usr/local/etc/v2ray/' ]; then install -d /usr/local/etc/v2ray/ for BASE in 00_log 01_api 02_dns 03_routing 04_policy 05_inbounds 06_outbounds 07_transport 08_stats 09_reverse; do echo '{}' > "/usr/local/etc/v2ray/$BASE.json" done + CONFDIR=yes fi -if [[ ! -d '/var/log/v2ray/' ]]; then - if [[ -n "$(id nobody | grep nogroup)" ]]; then - install -d -o nobody -g nogroup /var/log/v2ray/ - else - install -d -o nobody -g nobody /var/log/v2ray/ - fi +if [ ! -d '/var/log/v2ray/' ]; then + install -d -o nobody -g nobody /var/log/v2ray/ + LOG=yes fi -if [[ ! -f '/etc/systemd/system/v2ray.service' ]]; then +if [ ! -f '/etc/init.d/v2ray' ]; then mkdir "${TMP_DIRECTORY}init.d/" curl -o "${TMP_DIRECTORY}init.d/v2ray" https://raw.githubusercontent.workers.dev/v2fly/alpinelinux-install-v2ray/master/init.d/v2ray -s if [[ "$?" -ne '0' ]]; then @@ -79,6 +73,7 @@ if [[ ! -f '/etc/systemd/system/v2ray.service' ]]; then exit 1 fi install -m 755 "${TMP_DIRECTORY}init.d/v2ray" /etc/init.d/v2ray + OPENRC=yes fi rm -r "$TMP_DIRECTORY" @@ -87,15 +82,21 @@ echo 'installed: /usr/local/bin/v2ray' echo 'installed: /usr/local/bin/v2ctl' echo 'installed: /usr/local/lib/v2ray/geoip.dat' echo 'installed: /usr/local/lib/v2ray/geosite.dat' -echo 'installed: /usr/local/etc/v2ray/00_log.json' -echo 'installed: /usr/local/etc/v2ray/01_api.json' -echo 'installed: /usr/local/etc/v2ray/02_dns.json' -echo 'installed: /usr/local/etc/v2ray/03_routing.json' -echo 'installed: /usr/local/etc/v2ray/04_policy.json' -echo 'installed: /usr/local/etc/v2ray/05_inbounds.json' -echo 'installed: /usr/local/etc/v2ray/06_outbounds.json' -echo 'installed: /usr/local/etc/v2ray/07_transport.json' -echo 'installed: /usr/local/etc/v2ray/08_stats.json' -echo 'installed: /usr/local/etc/v2ray/09_reverse.json' -echo 'installed: /var/log/v2ray/' -echo 'installed: /etc/init.d/v2ray' +if [ -n "$CONFDIR" ]; then + echo 'installed: /usr/local/etc/v2ray/00_log.json' + echo 'installed: /usr/local/etc/v2ray/01_api.json' + echo 'installed: /usr/local/etc/v2ray/02_dns.json' + echo 'installed: /usr/local/etc/v2ray/03_routing.json' + echo 'installed: /usr/local/etc/v2ray/04_policy.json' + echo 'installed: /usr/local/etc/v2ray/05_inbounds.json' + echo 'installed: /usr/local/etc/v2ray/06_outbounds.json' + echo 'installed: /usr/local/etc/v2ray/07_transport.json' + echo 'installed: /usr/local/etc/v2ray/08_stats.json' + echo 'installed: /usr/local/etc/v2ray/09_reverse.json' +fi +if [ -n "$LOG" ]; then + echo 'installed: /var/log/v2ray/' +fi +if [ -n "$OPENRC" ]; then + echo 'installed: /etc/init.d/v2ray' +fi From dd4eefbb9dfa0063b9bfe68af1e9d7daeff6b0e7 Mon Sep 17 00:00:00 2001 From: Dct Mei Date: Sat, 11 Apr 2020 22:02:32 +0800 Subject: [PATCH 09/33] More precise content --- README.md | 8 ++++++++ install-release.sh | 16 ++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index adfcb43..3b05d54 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,13 @@ # alpinelinux-install-v2ray +## 依賴軟體 + +### 安裝 cURL + +``` +# apk add curl +``` + ## 下載 ``` diff --git a/install-release.sh b/install-release.sh index da3b869..06b4f58 100644 --- a/install-release.sh +++ b/install-release.sh @@ -49,6 +49,10 @@ done unzip -q "$ZIP_FILE" -d "$TMP_DIRECTORY" +if [ -n "$(pgrep v2ray)" ]; then + rc-service v2ray stop + V2RAY_RUNNING='1' +fi install -m 755 "${TMP_DIRECTORY}v2ray" "/usr/local/bin/v2ray" install -m 755 "${TMP_DIRECTORY}v2ctl" "/usr/local/bin/v2ctl" install -d /usr/local/lib/v2ray/ @@ -76,8 +80,6 @@ if [ ! -f '/etc/init.d/v2ray' ]; then OPENRC=yes fi -rm -r "$TMP_DIRECTORY" - echo 'installed: /usr/local/bin/v2ray' echo 'installed: /usr/local/bin/v2ctl' echo 'installed: /usr/local/lib/v2ray/geoip.dat' @@ -100,3 +102,13 @@ fi if [ -n "$OPENRC" ]; then echo 'installed: /etc/init.d/v2ray' fi +echo "You may need to execute a command to remove dependent software: apk del curl unzip" +if [ "$V2RAY_RUNNING" -eq '1' ]; then + rc-service v2ray start +else + echo 'Please execute the command: rcctl enable v2ray; rcctl start v2ray' +fi + +rm -r "$TMP_DIRECTORY" +echo "removed: $TMP_DIRECTORY" +echo "info: V2Ray is installed." From d2cb0619bdb8f9b5fd1453673e6d6cad50a1bacb Mon Sep 17 00:00:00 2001 From: Dct Mei Date: Sat, 11 Apr 2020 22:25:28 +0800 Subject: [PATCH 10/33] Replace '[[' with '[' --- install-release.sh | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/install-release.sh b/install-release.sh index 06b4f58..97d6d58 100644 --- a/install-release.sh +++ b/install-release.sh @@ -14,7 +14,7 @@ case "$(arch -s)" in ;; esac -if [ "$(command -v apk)" ]; then +if [[ "$(command -v apk)" ]]; then apk update apk add curl unzip else @@ -27,12 +27,12 @@ ZIP_FILE="${TMP_DIRECTORY}v2ray-linux-$BIT.zip" DOWNLOAD_LINK="https://github.com/v2ray/v2ray-core/releases/latest/download/v2ray-linux-$BIT.zip" curl -L -H 'Cache-Control: no-cache' -o "$ZIP_FILE" "$DOWNLOAD_LINK" -# -if [ "$?" -ne '0' ]; then +if [[ "$?" -ne '0' ]]; then echo 'error: Download failed! Please check your network or try again.' exit 1 fi curl -L -H 'Cache-Control: no-cache' -o "$ZIP_FILE.dgst" "$DOWNLOAD_LINK.dgst" -# -if [ "$?" -ne '0' ]; then +if [[ "$?" -ne '0' ]]; then echo 'error: Download failed! Please check your network or try again.' exit 1 fi @@ -40,8 +40,8 @@ fi # Verification of V2Ray archive for LISTSUM in 'md5' 'sha1' 'sha256' 'sha512'; do SUM="$(${LISTSUM}sum $ZIP_FILE | sed 's/ .*//')" - CHECKSUM="$(grep $(echo $LISTSUM | tr [:lower:] [:upper:]) $ZIP_FILE.dgst | sed 's/.* //')" - if [[ "$SUM" != "$CHECKSUM" ]]; then + CHECKSUM="$(grep $(echo $LISTSUM | tr [[:lower:]] [:upper:]) $ZIP_FILE.dgst | sed 's/.* //')" + if [[[ "$SUM" != "$CHECKSUM" ]]]; then echo 'error: Check failed! Please check your network or try again.' exit 1 fi @@ -49,7 +49,7 @@ done unzip -q "$ZIP_FILE" -d "$TMP_DIRECTORY" -if [ -n "$(pgrep v2ray)" ]; then +if [[ -n "$(pgrep v2ray)" ]]; then rc-service v2ray stop V2RAY_RUNNING='1' fi @@ -58,33 +58,33 @@ install -m 755 "${TMP_DIRECTORY}v2ctl" "/usr/local/bin/v2ctl" install -d /usr/local/lib/v2ray/ install -m 755 "${TMP_DIRECTORY}geoip.dat" "/usr/local/lib/v2ray/geoip.dat" install -m 755 "${TMP_DIRECTORY}geosite.dat" "/usr/local/lib/v2ray/geosite.dat" -if [ ! -d '/usr/local/etc/v2ray/' ]; then +if [[ ! -d '/usr/local/etc/v2ray/' ]]; then install -d /usr/local/etc/v2ray/ for BASE in 00_log 01_api 02_dns 03_routing 04_policy 05_inbounds 06_outbounds 07_transport 08_stats 09_reverse; do echo '{}' > "/usr/local/etc/v2ray/$BASE.json" done - CONFDIR=yes + CONFDIR='1' fi -if [ ! -d '/var/log/v2ray/' ]; then +if [[ ! -d '/var/log/v2ray/' ]]; then install -d -o nobody -g nobody /var/log/v2ray/ - LOG=yes + LOG='1' fi -if [ ! -f '/etc/init.d/v2ray' ]; then +if [[ ! -f '/etc/init.d/v2ray' ]]; then mkdir "${TMP_DIRECTORY}init.d/" curl -o "${TMP_DIRECTORY}init.d/v2ray" https://raw.githubusercontent.workers.dev/v2fly/alpinelinux-install-v2ray/master/init.d/v2ray -s - if [[ "$?" -ne '0' ]]; then + if [[[ "$?" -ne '0' ]]]; then echo 'error: Failed to start service file download! Please check your network or try again.' exit 1 fi install -m 755 "${TMP_DIRECTORY}init.d/v2ray" /etc/init.d/v2ray - OPENRC=yes + OPENRC='1' fi echo 'installed: /usr/local/bin/v2ray' echo 'installed: /usr/local/bin/v2ctl' echo 'installed: /usr/local/lib/v2ray/geoip.dat' echo 'installed: /usr/local/lib/v2ray/geosite.dat' -if [ -n "$CONFDIR" ]; then +if [[ "$CONFDIR" -eq '1' ]]; then echo 'installed: /usr/local/etc/v2ray/00_log.json' echo 'installed: /usr/local/etc/v2ray/01_api.json' echo 'installed: /usr/local/etc/v2ray/02_dns.json' @@ -96,14 +96,14 @@ if [ -n "$CONFDIR" ]; then echo 'installed: /usr/local/etc/v2ray/08_stats.json' echo 'installed: /usr/local/etc/v2ray/09_reverse.json' fi -if [ -n "$LOG" ]; then +if [[ "$LOG" -eq '1' ]]; then echo 'installed: /var/log/v2ray/' fi -if [ -n "$OPENRC" ]; then +if [[ "$OPENRC" -eq '1' ]]; then echo 'installed: /etc/init.d/v2ray' fi echo "You may need to execute a command to remove dependent software: apk del curl unzip" -if [ "$V2RAY_RUNNING" -eq '1' ]; then +if [[ "$V2RAY_RUNNING" -eq '1' ]]; then rc-service v2ray start else echo 'Please execute the command: rcctl enable v2ray; rcctl start v2ray' From a5c6a928c3507098804aaab961961d69827da145 Mon Sep 17 00:00:00 2001 From: Dct Mei Date: Sat, 11 Apr 2020 22:27:19 +0800 Subject: [PATCH 11/33] Fix mistakes --- install-release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install-release.sh b/install-release.sh index 97d6d58..6fa5a60 100644 --- a/install-release.sh +++ b/install-release.sh @@ -41,7 +41,7 @@ fi for LISTSUM in 'md5' 'sha1' 'sha256' 'sha512'; do SUM="$(${LISTSUM}sum $ZIP_FILE | sed 's/ .*//')" CHECKSUM="$(grep $(echo $LISTSUM | tr [[:lower:]] [:upper:]) $ZIP_FILE.dgst | sed 's/.* //')" - if [[[ "$SUM" != "$CHECKSUM" ]]]; then + if [[ "$SUM" != "$CHECKSUM" ]]; then echo 'error: Check failed! Please check your network or try again.' exit 1 fi @@ -72,7 +72,7 @@ fi if [[ ! -f '/etc/init.d/v2ray' ]]; then mkdir "${TMP_DIRECTORY}init.d/" curl -o "${TMP_DIRECTORY}init.d/v2ray" https://raw.githubusercontent.workers.dev/v2fly/alpinelinux-install-v2ray/master/init.d/v2ray -s - if [[[ "$?" -ne '0' ]]]; then + if [[ "$?" -ne '0' ]]; then echo 'error: Failed to start service file download! Please check your network or try again.' exit 1 fi From d2646c13ef5def31e4cabe714837ff033050488e Mon Sep 17 00:00:00 2001 From: Dct Mei Date: Sat, 11 Apr 2020 22:28:47 +0800 Subject: [PATCH 12/33] Correct the output --- install-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-release.sh b/install-release.sh index 6fa5a60..88364c1 100644 --- a/install-release.sh +++ b/install-release.sh @@ -106,7 +106,7 @@ echo "You may need to execute a command to remove dependent software: apk del cu if [[ "$V2RAY_RUNNING" -eq '1' ]]; then rc-service v2ray start else - echo 'Please execute the command: rcctl enable v2ray; rcctl start v2ray' + echo 'Please execute the command: rc-update add v2ray; rc-service v2ray start' fi rm -r "$TMP_DIRECTORY" From 7bf703a7b9ab0c3a42e1f37eda382f4179eb36f5 Mon Sep 17 00:00:00 2001 From: Dct Mei Date: Sat, 11 Apr 2020 22:35:05 +0800 Subject: [PATCH 13/33] Fix case conversion --- install-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-release.sh b/install-release.sh index 88364c1..77aa6eb 100644 --- a/install-release.sh +++ b/install-release.sh @@ -40,7 +40,7 @@ fi # Verification of V2Ray archive for LISTSUM in 'md5' 'sha1' 'sha256' 'sha512'; do SUM="$(${LISTSUM}sum $ZIP_FILE | sed 's/ .*//')" - CHECKSUM="$(grep $(echo $LISTSUM | tr [[:lower:]] [:upper:]) $ZIP_FILE.dgst | sed 's/.* //')" + CHECKSUM="$(grep $(echo $LISTSUM | tr [:lower:] [:upper:]) $ZIP_FILE.dgst | sed 's/.* //')" if [[ "$SUM" != "$CHECKSUM" ]]; then echo 'error: Check failed! Please check your network or try again.' exit 1 From dc331147b4d9d8d0784d3096cee9677bdeba288d Mon Sep 17 00:00:00 2001 From: Dct Mei Date: Sat, 11 Apr 2020 23:08:48 +0800 Subject: [PATCH 14/33] Basically available --- install-release.sh | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/install-release.sh b/install-release.sh index 77aa6eb..352b74e 100644 --- a/install-release.sh +++ b/install-release.sh @@ -14,7 +14,7 @@ case "$(arch -s)" in ;; esac -if [[ "$(command -v apk)" ]]; then +if [ "$(command -v apk)" ]; then apk update apk add curl unzip else @@ -27,12 +27,12 @@ ZIP_FILE="${TMP_DIRECTORY}v2ray-linux-$BIT.zip" DOWNLOAD_LINK="https://github.com/v2ray/v2ray-core/releases/latest/download/v2ray-linux-$BIT.zip" curl -L -H 'Cache-Control: no-cache' -o "$ZIP_FILE" "$DOWNLOAD_LINK" -# -if [[ "$?" -ne '0' ]]; then +if [ "$?" -ne '0' ]; then echo 'error: Download failed! Please check your network or try again.' exit 1 fi curl -L -H 'Cache-Control: no-cache' -o "$ZIP_FILE.dgst" "$DOWNLOAD_LINK.dgst" -# -if [[ "$?" -ne '0' ]]; then +if [ "$?" -ne '0' ]; then echo 'error: Download failed! Please check your network or try again.' exit 1 fi @@ -41,7 +41,7 @@ fi for LISTSUM in 'md5' 'sha1' 'sha256' 'sha512'; do SUM="$(${LISTSUM}sum $ZIP_FILE | sed 's/ .*//')" CHECKSUM="$(grep $(echo $LISTSUM | tr [:lower:] [:upper:]) $ZIP_FILE.dgst | sed 's/.* //')" - if [[ "$SUM" != "$CHECKSUM" ]]; then + if [ "$SUM" != "$CHECKSUM" ]; then echo 'error: Check failed! Please check your network or try again.' exit 1 fi @@ -49,7 +49,8 @@ done unzip -q "$ZIP_FILE" -d "$TMP_DIRECTORY" -if [[ -n "$(pgrep v2ray)" ]]; then +V2RAY_RUNNING= +if [ -n "$(pgrep v2ray)" ]; then rc-service v2ray stop V2RAY_RUNNING='1' fi @@ -58,21 +59,24 @@ install -m 755 "${TMP_DIRECTORY}v2ctl" "/usr/local/bin/v2ctl" install -d /usr/local/lib/v2ray/ install -m 755 "${TMP_DIRECTORY}geoip.dat" "/usr/local/lib/v2ray/geoip.dat" install -m 755 "${TMP_DIRECTORY}geosite.dat" "/usr/local/lib/v2ray/geosite.dat" -if [[ ! -d '/usr/local/etc/v2ray/' ]]; then +CONFDIR= +if [ ! -d '/usr/local/etc/v2ray/' ]; then install -d /usr/local/etc/v2ray/ for BASE in 00_log 01_api 02_dns 03_routing 04_policy 05_inbounds 06_outbounds 07_transport 08_stats 09_reverse; do echo '{}' > "/usr/local/etc/v2ray/$BASE.json" done CONFDIR='1' fi -if [[ ! -d '/var/log/v2ray/' ]]; then +LOG= +if [ ! -d '/var/log/v2ray/' ]; then install -d -o nobody -g nobody /var/log/v2ray/ LOG='1' fi -if [[ ! -f '/etc/init.d/v2ray' ]]; then +OPENRC= +if [ ! -f '/etc/init.d/v2ray' ]; then mkdir "${TMP_DIRECTORY}init.d/" curl -o "${TMP_DIRECTORY}init.d/v2ray" https://raw.githubusercontent.workers.dev/v2fly/alpinelinux-install-v2ray/master/init.d/v2ray -s - if [[ "$?" -ne '0' ]]; then + if [ "$?" -ne '0' ]; then echo 'error: Failed to start service file download! Please check your network or try again.' exit 1 fi @@ -84,7 +88,7 @@ echo 'installed: /usr/local/bin/v2ray' echo 'installed: /usr/local/bin/v2ctl' echo 'installed: /usr/local/lib/v2ray/geoip.dat' echo 'installed: /usr/local/lib/v2ray/geosite.dat' -if [[ "$CONFDIR" -eq '1' ]]; then +if [ "$CONFDIR" -eq '1' ]; then echo 'installed: /usr/local/etc/v2ray/00_log.json' echo 'installed: /usr/local/etc/v2ray/01_api.json' echo 'installed: /usr/local/etc/v2ray/02_dns.json' @@ -96,19 +100,18 @@ if [[ "$CONFDIR" -eq '1' ]]; then echo 'installed: /usr/local/etc/v2ray/08_stats.json' echo 'installed: /usr/local/etc/v2ray/09_reverse.json' fi -if [[ "$LOG" -eq '1' ]]; then +if [ "$LOG" -eq '1' ]; then echo 'installed: /var/log/v2ray/' fi -if [[ "$OPENRC" -eq '1' ]]; then +if [ "$OPENRC" -eq '1' ]; then echo 'installed: /etc/init.d/v2ray' fi +rm -r "$TMP_DIRECTORY" +echo "removed: $TMP_DIRECTORY" echo "You may need to execute a command to remove dependent software: apk del curl unzip" -if [[ "$V2RAY_RUNNING" -eq '1' ]]; then +if [ "$V2RAY_RUNNING" -eq '1' ]; then rc-service v2ray start else echo 'Please execute the command: rc-update add v2ray; rc-service v2ray start' fi - -rm -r "$TMP_DIRECTORY" -echo "removed: $TMP_DIRECTORY" echo "info: V2Ray is installed." From 7fc7febe13b124c5602c581c07ccb50ab1961fc8 Mon Sep 17 00:00:00 2001 From: Dct Mei Date: Sat, 11 Apr 2020 23:28:17 +0800 Subject: [PATCH 15/33] Variable correction --- install-release.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install-release.sh b/install-release.sh index 352b74e..6c121d1 100644 --- a/install-release.sh +++ b/install-release.sh @@ -49,7 +49,7 @@ done unzip -q "$ZIP_FILE" -d "$TMP_DIRECTORY" -V2RAY_RUNNING= +V2RAY_RUNNING='0' if [ -n "$(pgrep v2ray)" ]; then rc-service v2ray stop V2RAY_RUNNING='1' @@ -59,7 +59,7 @@ install -m 755 "${TMP_DIRECTORY}v2ctl" "/usr/local/bin/v2ctl" install -d /usr/local/lib/v2ray/ install -m 755 "${TMP_DIRECTORY}geoip.dat" "/usr/local/lib/v2ray/geoip.dat" install -m 755 "${TMP_DIRECTORY}geosite.dat" "/usr/local/lib/v2ray/geosite.dat" -CONFDIR= +CONFDIR='0' if [ ! -d '/usr/local/etc/v2ray/' ]; then install -d /usr/local/etc/v2ray/ for BASE in 00_log 01_api 02_dns 03_routing 04_policy 05_inbounds 06_outbounds 07_transport 08_stats 09_reverse; do @@ -67,12 +67,12 @@ if [ ! -d '/usr/local/etc/v2ray/' ]; then done CONFDIR='1' fi -LOG= +LOG='0' if [ ! -d '/var/log/v2ray/' ]; then install -d -o nobody -g nobody /var/log/v2ray/ LOG='1' fi -OPENRC= +OPENRC='0' if [ ! -f '/etc/init.d/v2ray' ]; then mkdir "${TMP_DIRECTORY}init.d/" curl -o "${TMP_DIRECTORY}init.d/v2ray" https://raw.githubusercontent.workers.dev/v2fly/alpinelinux-install-v2ray/master/init.d/v2ray -s From 7e8ad02265920f4c2bfa6a7a20015b894db2ec0e Mon Sep 17 00:00:00 2001 From: Dct Mei Date: Sun, 12 Apr 2020 12:12:58 +0800 Subject: [PATCH 16/33] Complete basic revision --- install-release.sh | 254 +++++++++++++++++++++++++++------------------ 1 file changed, 151 insertions(+), 103 deletions(-) diff --git a/install-release.sh b/install-release.sh index 6c121d1..d94367f 100644 --- a/install-release.sh +++ b/install-release.sh @@ -1,117 +1,165 @@ #!/bin/ash -# Judge architecture -case "$(arch -s)" in - 'i386' | 'i686') - BIT='32' - ;; - 'amd64' | 'x86_64') - BIT='64' - ;; - *) - echo "error: The architecture is not supported." - exit 1 - ;; -esac - -if [ "$(command -v apk)" ]; then - apk update - apk add curl unzip -else - echo "error: The script does not support the package manager in this operating system." - exit 1 -fi - TMP_DIRECTORY="$(mktemp -d)/" ZIP_FILE="${TMP_DIRECTORY}v2ray-linux-$BIT.zip" DOWNLOAD_LINK="https://github.com/v2ray/v2ray-core/releases/latest/download/v2ray-linux-$BIT.zip" -curl -L -H 'Cache-Control: no-cache' -o "$ZIP_FILE" "$DOWNLOAD_LINK" -# -if [ "$?" -ne '0' ]; then - echo 'error: Download failed! Please check your network or try again.' - exit 1 -fi -curl -L -H 'Cache-Control: no-cache' -o "$ZIP_FILE.dgst" "$DOWNLOAD_LINK.dgst" -# -if [ "$?" -ne '0' ]; then - echo 'error: Download failed! Please check your network or try again.' - exit 1 -fi +identify_architecture() { + case "$(arch -s)" in + 'i386' | 'i686') + BIT='32' + ;; + 'amd64' | 'x86_64') + BIT='64' + ;; + *) + echo "error: The architecture is not supported." + exit 1 + ;; + esac +} -# Verification of V2Ray archive -for LISTSUM in 'md5' 'sha1' 'sha256' 'sha512'; do - SUM="$(${LISTSUM}sum $ZIP_FILE | sed 's/ .*//')" - CHECKSUM="$(grep $(echo $LISTSUM | tr [:lower:] [:upper:]) $ZIP_FILE.dgst | sed 's/.* //')" - if [ "$SUM" != "$CHECKSUM" ]; then - echo 'error: Check failed! Please check your network or try again.' +install_software() { + if [[ -n "$(command -v curl)" ]]; then + return + fi + if [[ -n "$(command -v unzip)" ]]; then + return + fi + if [ "$(command -v apk)" ]; then + apk add curl unzip + else + echo "error: The script does not support the package manager in this operating system." exit 1 fi -done +} -unzip -q "$ZIP_FILE" -d "$TMP_DIRECTORY" - -V2RAY_RUNNING='0' -if [ -n "$(pgrep v2ray)" ]; then - rc-service v2ray stop - V2RAY_RUNNING='1' -fi -install -m 755 "${TMP_DIRECTORY}v2ray" "/usr/local/bin/v2ray" -install -m 755 "${TMP_DIRECTORY}v2ctl" "/usr/local/bin/v2ctl" -install -d /usr/local/lib/v2ray/ -install -m 755 "${TMP_DIRECTORY}geoip.dat" "/usr/local/lib/v2ray/geoip.dat" -install -m 755 "${TMP_DIRECTORY}geosite.dat" "/usr/local/lib/v2ray/geosite.dat" -CONFDIR='0' -if [ ! -d '/usr/local/etc/v2ray/' ]; then - install -d /usr/local/etc/v2ray/ - for BASE in 00_log 01_api 02_dns 03_routing 04_policy 05_inbounds 06_outbounds 07_transport 08_stats 09_reverse; do - echo '{}' > "/usr/local/etc/v2ray/$BASE.json" - done - CONFDIR='1' -fi -LOG='0' -if [ ! -d '/var/log/v2ray/' ]; then - install -d -o nobody -g nobody /var/log/v2ray/ - LOG='1' -fi -OPENRC='0' -if [ ! -f '/etc/init.d/v2ray' ]; then - mkdir "${TMP_DIRECTORY}init.d/" - curl -o "${TMP_DIRECTORY}init.d/v2ray" https://raw.githubusercontent.workers.dev/v2fly/alpinelinux-install-v2ray/master/init.d/v2ray -s +download_v2ray() { + curl -L -H 'Cache-Control: no-cache' -o "$ZIP_FILE" "$DOWNLOAD_LINK" -# if [ "$?" -ne '0' ]; then - echo 'error: Failed to start service file download! Please check your network or try again.' + echo 'error: Download failed! Please check your network or try again.' exit 1 fi - install -m 755 "${TMP_DIRECTORY}init.d/v2ray" /etc/init.d/v2ray - OPENRC='1' -fi + curl -L -H 'Cache-Control: no-cache' -o "$ZIP_FILE.dgst" "$DOWNLOAD_LINK.dgst" -# + if [ "$?" -ne '0' ]; then + echo 'error: Download failed! Please check your network or try again.' + exit 1 + fi +} -echo 'installed: /usr/local/bin/v2ray' -echo 'installed: /usr/local/bin/v2ctl' -echo 'installed: /usr/local/lib/v2ray/geoip.dat' -echo 'installed: /usr/local/lib/v2ray/geosite.dat' -if [ "$CONFDIR" -eq '1' ]; then - echo 'installed: /usr/local/etc/v2ray/00_log.json' - echo 'installed: /usr/local/etc/v2ray/01_api.json' - echo 'installed: /usr/local/etc/v2ray/02_dns.json' - echo 'installed: /usr/local/etc/v2ray/03_routing.json' - echo 'installed: /usr/local/etc/v2ray/04_policy.json' - echo 'installed: /usr/local/etc/v2ray/05_inbounds.json' - echo 'installed: /usr/local/etc/v2ray/06_outbounds.json' - echo 'installed: /usr/local/etc/v2ray/07_transport.json' - echo 'installed: /usr/local/etc/v2ray/08_stats.json' - echo 'installed: /usr/local/etc/v2ray/09_reverse.json' -fi -if [ "$LOG" -eq '1' ]; then - echo 'installed: /var/log/v2ray/' -fi -if [ "$OPENRC" -eq '1' ]; then - echo 'installed: /etc/init.d/v2ray' -fi -rm -r "$TMP_DIRECTORY" -echo "removed: $TMP_DIRECTORY" -echo "You may need to execute a command to remove dependent software: apk del curl unzip" -if [ "$V2RAY_RUNNING" -eq '1' ]; then - rc-service v2ray start -else - echo 'Please execute the command: rc-update add v2ray; rc-service v2ray start' -fi -echo "info: V2Ray is installed." +verification_v2ray() { + for LISTSUM in 'md5' 'sha1' 'sha256' 'sha512'; do + SUM="$(${LISTSUM}sum $ZIP_FILE | sed 's/ .*//')" + CHECKSUM="$(grep $(echo $LISTSUM | tr [:lower:] [:upper:]) $ZIP_FILE.dgst | sed 's/.* //')" + if [ "$SUM" != "$CHECKSUM" ]; then + echo 'error: Check failed! Please check your network or try again.' + exit 1 + fi + done +} + +decompression() { + unzip -q "$ZIP_FILE" -d "$TMP_DIRECTORY" +} + +is_it_running() { + V2RAY_RUNNING='0' + if [ -n "$(pgrep v2ray)" ]; then + rc-service v2ray stop + V2RAY_RUNNING='1' + fi +} + +install_v2ray() { + install -m 755 "${TMP_DIRECTORY}v2ray" "/usr/local/bin/v2ray" + install -m 755 "${TMP_DIRECTORY}v2ctl" "/usr/local/bin/v2ctl" + install -d /usr/local/lib/v2ray/ + install -m 755 "${TMP_DIRECTORY}geoip.dat" "/usr/local/lib/v2ray/geoip.dat" + install -m 755 "${TMP_DIRECTORY}geosite.dat" "/usr/local/lib/v2ray/geosite.dat" +} + +install_confdir() { + CONFDIR='0' + if [ ! -d '/usr/local/etc/v2ray/' ]; then + install -d /usr/local/etc/v2ray/ + for BASE in 00_log 01_api 02_dns 03_routing 04_policy 05_inbounds 06_outbounds 07_transport 08_stats 09_reverse; do + echo '{}' > "/usr/local/etc/v2ray/$BASE.json" + done + CONFDIR='1' + fi +} + +install_log() { + LOG='0' + if [ ! -d '/var/log/v2ray/' ]; then + install -d -o nobody -g nobody /var/log/v2ray/ + install -m 600 -o nobody -g nobody /var/log/v2ray/access.log + install -m 600 -o nobody -g nobody /var/log/v2ray/error.log + LOG='1' + fi +} + +install_startup_service_file() { + OPENRC='0' + if [ ! -f '/etc/init.d/v2ray' ]; then + mkdir "${TMP_DIRECTORY}init.d/" + curl -o "${TMP_DIRECTORY}init.d/v2ray" https://raw.githubusercontent.workers.dev/v2fly/alpinelinux-install-v2ray/master/init.d/v2ray -s + if [ "$?" -ne '0' ]; then + echo 'error: Failed to start service file download! Please check your network or try again.' + exit 1 + fi + install -m 755 "${TMP_DIRECTORY}init.d/v2ray" /etc/init.d/v2ray + OPENRC='1' + fi +} + +information() { + echo 'installed: /usr/local/bin/v2ray' + echo 'installed: /usr/local/bin/v2ctl' + echo 'installed: /usr/local/lib/v2ray/geoip.dat' + echo 'installed: /usr/local/lib/v2ray/geosite.dat' + if [ "$CONFDIR" -eq '1' ]; then + echo 'installed: /usr/local/etc/v2ray/00_log.json' + echo 'installed: /usr/local/etc/v2ray/01_api.json' + echo 'installed: /usr/local/etc/v2ray/02_dns.json' + echo 'installed: /usr/local/etc/v2ray/03_routing.json' + echo 'installed: /usr/local/etc/v2ray/04_policy.json' + echo 'installed: /usr/local/etc/v2ray/05_inbounds.json' + echo 'installed: /usr/local/etc/v2ray/06_outbounds.json' + echo 'installed: /usr/local/etc/v2ray/07_transport.json' + echo 'installed: /usr/local/etc/v2ray/08_stats.json' + echo 'installed: /usr/local/etc/v2ray/09_reverse.json' + fi + if [ "$LOG" -eq '1' ]; then + echo 'installed: /var/log/v2ray/' + fi + if [ "$OPENRC" -eq '1' ]; then + echo 'installed: /etc/init.d/v2ray' + fi + rm -r "$TMP_DIRECTORY" + echo "removed: $TMP_DIRECTORY" + echo "You may need to execute a command to remove dependent software: apk del curl unzip" + if [ "$V2RAY_RUNNING" -eq '1' ]; then + rc-service v2ray start + else + echo 'Please execute the command: rc-update add v2ray; rc-service v2ray start' + fi + echo "info: V2Ray is installed." +} + +main() { + identify_architecture + install_software + install_software + download_v2ray + verification_v2ray + decompression + is_it_running + install_v2ray + install_confdir + install_log + install_startup_service_file + information +} + +main From dd1b0330ea79c44b8e4b02167979074829ec9ccf Mon Sep 17 00:00:00 2001 From: Dct Mei Date: Mon, 13 Apr 2020 00:41:50 +0800 Subject: [PATCH 17/33] Fix mistakes --- install-release.sh | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/install-release.sh b/install-release.sh index d94367f..67160f4 100644 --- a/install-release.sh +++ b/install-release.sh @@ -1,24 +1,23 @@ #!/bin/ash +# Identify architecture +case "$(arch -s)" in + 'i386' | 'i686') + BIT='32' + ;; + 'amd64' | 'x86_64') + BIT='64' + ;; + *) + echo "error: The architecture is not supported." + exit 1 + ;; +esac + TMP_DIRECTORY="$(mktemp -d)/" ZIP_FILE="${TMP_DIRECTORY}v2ray-linux-$BIT.zip" DOWNLOAD_LINK="https://github.com/v2ray/v2ray-core/releases/latest/download/v2ray-linux-$BIT.zip" -identify_architecture() { - case "$(arch -s)" in - 'i386' | 'i686') - BIT='32' - ;; - 'amd64' | 'x86_64') - BIT='64' - ;; - *) - echo "error: The architecture is not supported." - exit 1 - ;; - esac -} - install_software() { if [[ -n "$(command -v curl)" ]]; then return @@ -148,7 +147,6 @@ information() { } main() { - identify_architecture install_software install_software download_v2ray From a600b066da67c95b4d48e18037349bed7eca3fd0 Mon Sep 17 00:00:00 2001 From: Dct Mei Date: Mon, 13 Apr 2020 10:23:38 +0800 Subject: [PATCH 18/33] Fix the source of log files --- install-release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install-release.sh b/install-release.sh index 67160f4..6bc82c0 100644 --- a/install-release.sh +++ b/install-release.sh @@ -92,8 +92,8 @@ install_log() { LOG='0' if [ ! -d '/var/log/v2ray/' ]; then install -d -o nobody -g nobody /var/log/v2ray/ - install -m 600 -o nobody -g nobody /var/log/v2ray/access.log - install -m 600 -o nobody -g nobody /var/log/v2ray/error.log + install -m 600 -o nobody -g nobody /dev/null /var/log/v2ray/access.log + install -m 600 -o nobody -g nobody /dev/null /var/log/v2ray/error.log LOG='1' fi } From ecb25454be19f467769af9bb4a652f67a763d329 Mon Sep 17 00:00:00 2001 From: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com> Date: Sun, 12 Jul 2020 14:15:50 +0800 Subject: [PATCH 19/33] Make script more compatible and fails fast --- install-release.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/install-release.sh b/install-release.sh index 6bc82c0..240bb17 100644 --- a/install-release.sh +++ b/install-release.sh @@ -1,4 +1,6 @@ -#!/bin/ash +#!/usr/bin/env bash + +set -euxo pipefail # Identify architecture case "$(arch -s)" in From 1bc4e215d89fbc6f0b9c24ed6f60b0b879f44ef9 Mon Sep 17 00:00:00 2001 From: Elvis Wang Date: Wed, 30 Dec 2020 00:48:16 +0800 Subject: [PATCH 20/33] Update download link to v2fly and fix #2 Issue (#3) * Update download link to v2fly. * Update "Identify architecture" * Fix Line 56 variable name * Try to fix verification_v2ray * improve detect arm without vfp --- install-release.sh | 48 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/install-release.sh b/install-release.sh index 240bb17..a6af0ad 100644 --- a/install-release.sh +++ b/install-release.sh @@ -5,10 +5,48 @@ set -euxo pipefail # Identify architecture case "$(arch -s)" in 'i386' | 'i686') - BIT='32' + MACHINE='32' ;; 'amd64' | 'x86_64') - BIT='64' + MACHINE='64' + ;; + 'armv5tel') + MACHINE='arm32-v5' + ;; + 'armv6l') + MACHINE='arm32-v6' + grep Features /proc/cpuinfo | grep -qw 'vfp' || MACHINE='arm32-v5' + ;; + 'armv7' | 'armv7l') + MACHINE='arm32-v7a' + grep Features /proc/cpuinfo | grep -qw 'vfp' || MACHINE='arm32-v5' + ;; + 'armv8' | 'aarch64') + MACHINE='arm64-v8a' + ;; + 'mips') + MACHINE='mips32' + ;; + 'mipsle') + MACHINE='mips32le' + ;; + 'mips64') + MACHINE='mips64' + ;; + 'mips64le') + MACHINE='mips64le' + ;; + 'ppc64') + MACHINE='ppc64' + ;; + 'ppc64le') + MACHINE='ppc64le' + ;; + 'riscv64') + MACHINE='riscv64' + ;; + 's390x') + MACHINE='s390x' ;; *) echo "error: The architecture is not supported." @@ -17,8 +55,8 @@ case "$(arch -s)" in esac TMP_DIRECTORY="$(mktemp -d)/" -ZIP_FILE="${TMP_DIRECTORY}v2ray-linux-$BIT.zip" -DOWNLOAD_LINK="https://github.com/v2ray/v2ray-core/releases/latest/download/v2ray-linux-$BIT.zip" +ZIP_FILE="${TMP_DIRECTORY}v2ray-linux-$MACHINE.zip" +DOWNLOAD_LINK="https://github.com/v2fly/v2ray-core/releases/latest/download/v2ray-linux-$MACHINE.zip" install_software() { if [[ -n "$(command -v curl)" ]]; then @@ -51,7 +89,7 @@ download_v2ray() { verification_v2ray() { for LISTSUM in 'md5' 'sha1' 'sha256' 'sha512'; do SUM="$(${LISTSUM}sum $ZIP_FILE | sed 's/ .*//')" - CHECKSUM="$(grep $(echo $LISTSUM | tr [:lower:] [:upper:]) $ZIP_FILE.dgst | sed 's/.* //')" + CHECKSUM="$(grep $(echo $LISTSUM | tr [:lower:] [:upper:]) $ZIP_FILE.dgst | uniq | sed 's/.* //')" if [ "$SUM" != "$CHECKSUM" ]; then echo 'error: Check failed! Please check your network or try again.' exit 1 From 58e083aa6553bf0a903294de60f5baf31563949c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E3=81=AE=E3=81=8B=E3=81=88=E3=81=A7?= Date: Sun, 4 Apr 2021 08:42:41 +0800 Subject: [PATCH 21/33] feat: install Xray-core --- README.md | 14 +++---- init.d/{v2ray => xray} | 16 ++++---- install-release.sh | 92 +++++++++++++++++++++--------------------- 3 files changed, 60 insertions(+), 62 deletions(-) rename init.d/{v2ray => xray} (51%) diff --git a/README.md b/README.md index 3b05d54..fdf5c7a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# alpinelinux-install-v2ray +# alpinelinux-install-xray ## 依賴軟體 @@ -11,7 +11,7 @@ ## 下載 ``` -$ curl -O https://raw.githubusercontent.com/v2fly/alpinelinux-install-v2ray/master/install-release.sh +$ curl -O https://raw.githubusercontent.com/XTLS/alpinelinux-install-xray/main/install-release.sh ``` ## 使用 @@ -25,29 +25,29 @@ $ curl -O https://raw.githubusercontent.com/v2fly/alpinelinux-install-v2ray/mast ### 啟用 ``` -# rc-update add v2ray +# rc-update add xray ``` ### 禁用 ``` -# rc-update del v2ray +# rc-update del xray ``` ### 啟動 ``` -# rc-service v2ray start +# rc-service xray start ``` ### 關閉 ``` -# rc-service v2ray stop +# rc-service xray stop ``` ### 重啟 ``` -# rc-service v2ray restart +# rc-service xray restart ``` diff --git a/init.d/v2ray b/init.d/xray similarity index 51% rename from init.d/v2ray rename to init.d/xray index e44ccca..be0eb0a 100644 --- a/init.d/v2ray +++ b/init.d/xray @@ -1,17 +1,17 @@ #!/sbin/openrc-run -name="V2Ray" -description="A platform for building proxies to bypass network restrictions" +name="Xray" +description="The best v2ray-core, with XTLS support" description_checkconfig="Test configuration file" -: ${env:="V2RAY_LOCATION_ASSET=/usr/local/lib/v2ray/"} -: ${confdir:="/usr/local/etc/v2ray/"} +: ${env:="XRAY_LOCATION_ASSET=/usr/local/lib/xray/"} +: ${confdir:="/usr/local/etc/xray/"} -command="/usr/local/bin/v2ray" -command_args="-confdir $confdir" +command="/usr/local/bin/xray" +command_args="run -confdir $confdir" command_user="nobody" -pidfile="/run/v2ray.pid" +pidfile="/run/xray.pid" command_background="yes" extra_commands="checkconfig" @@ -26,7 +26,7 @@ checkconfig() { return 1 fi export $env - $command -test $command_args + $command $command_args -test } start_pre() { diff --git a/install-release.sh b/install-release.sh index a6af0ad..9bccc4b 100644 --- a/install-release.sh +++ b/install-release.sh @@ -55,8 +55,8 @@ case "$(arch -s)" in esac TMP_DIRECTORY="$(mktemp -d)/" -ZIP_FILE="${TMP_DIRECTORY}v2ray-linux-$MACHINE.zip" -DOWNLOAD_LINK="https://github.com/v2fly/v2ray-core/releases/latest/download/v2ray-linux-$MACHINE.zip" +ZIP_FILE="${TMP_DIRECTORY}Xray-linux-$MACHINE.zip" +DOWNLOAD_LINK="https://github.com/XTLS/Xray-core/releases/latest/download/Xray-linux-$MACHINE.zip" install_software() { if [[ -n "$(command -v curl)" ]]; then @@ -73,7 +73,7 @@ install_software() { fi } -download_v2ray() { +download_xray() { curl -L -H 'Cache-Control: no-cache' -o "$ZIP_FILE" "$DOWNLOAD_LINK" -# if [ "$?" -ne '0' ]; then echo 'error: Download failed! Please check your network or try again.' @@ -86,7 +86,7 @@ download_v2ray() { fi } -verification_v2ray() { +verification_xray() { for LISTSUM in 'md5' 'sha1' 'sha256' 'sha512'; do SUM="$(${LISTSUM}sum $ZIP_FILE | sed 's/ .*//')" CHECKSUM="$(grep $(echo $LISTSUM | tr [:lower:] [:upper:]) $ZIP_FILE.dgst | uniq | sed 's/.* //')" @@ -102,27 +102,26 @@ decompression() { } is_it_running() { - V2RAY_RUNNING='0' - if [ -n "$(pgrep v2ray)" ]; then - rc-service v2ray stop - V2RAY_RUNNING='1' + XRAY_RUNNING='0' + if [ -n "$(pgrep xray)" ]; then + rc-service xray stop + XRAY_RUNNING='1' fi } -install_v2ray() { - install -m 755 "${TMP_DIRECTORY}v2ray" "/usr/local/bin/v2ray" - install -m 755 "${TMP_DIRECTORY}v2ctl" "/usr/local/bin/v2ctl" - install -d /usr/local/lib/v2ray/ - install -m 755 "${TMP_DIRECTORY}geoip.dat" "/usr/local/lib/v2ray/geoip.dat" - install -m 755 "${TMP_DIRECTORY}geosite.dat" "/usr/local/lib/v2ray/geosite.dat" +install_xray() { + install -m 755 "${TMP_DIRECTORY}xray" "/usr/local/bin/xray" + install -d /usr/local/lib/xray/ + install -m 755 "${TMP_DIRECTORY}geoip.dat" "/usr/local/lib/xray/geoip.dat" + install -m 755 "${TMP_DIRECTORY}geosite.dat" "/usr/local/lib/xray/geosite.dat" } install_confdir() { CONFDIR='0' - if [ ! -d '/usr/local/etc/v2ray/' ]; then - install -d /usr/local/etc/v2ray/ + if [ ! -d '/usr/local/etc/xray/' ]; then + install -d /usr/local/etc/xray/ for BASE in 00_log 01_api 02_dns 03_routing 04_policy 05_inbounds 06_outbounds 07_transport 08_stats 09_reverse; do - echo '{}' > "/usr/local/etc/v2ray/$BASE.json" + echo '{}' > "/usr/local/etc/xray/$BASE.json" done CONFDIR='1' fi @@ -130,70 +129,69 @@ install_confdir() { install_log() { LOG='0' - if [ ! -d '/var/log/v2ray/' ]; then - install -d -o nobody -g nobody /var/log/v2ray/ - install -m 600 -o nobody -g nobody /dev/null /var/log/v2ray/access.log - install -m 600 -o nobody -g nobody /dev/null /var/log/v2ray/error.log + if [ ! -d '/var/log/xray/' ]; then + install -d -o nobody -g nobody /var/log/xray/ + install -m 600 -o nobody -g nobody /dev/null /var/log/xray/access.log + install -m 600 -o nobody -g nobody /dev/null /var/log/xray/error.log LOG='1' fi } install_startup_service_file() { OPENRC='0' - if [ ! -f '/etc/init.d/v2ray' ]; then + if [ ! -f '/etc/init.d/xray' ]; then mkdir "${TMP_DIRECTORY}init.d/" - curl -o "${TMP_DIRECTORY}init.d/v2ray" https://raw.githubusercontent.workers.dev/v2fly/alpinelinux-install-v2ray/master/init.d/v2ray -s + curl -o "${TMP_DIRECTORY}init.d/xray" https://raw.githubusercontent.com/XTLS/alpinelinux-install-xray/main/init.d/xray -s if [ "$?" -ne '0' ]; then echo 'error: Failed to start service file download! Please check your network or try again.' exit 1 fi - install -m 755 "${TMP_DIRECTORY}init.d/v2ray" /etc/init.d/v2ray + install -m 755 "${TMP_DIRECTORY}init.d/xray" /etc/init.d/xray OPENRC='1' fi } information() { - echo 'installed: /usr/local/bin/v2ray' - echo 'installed: /usr/local/bin/v2ctl' - echo 'installed: /usr/local/lib/v2ray/geoip.dat' - echo 'installed: /usr/local/lib/v2ray/geosite.dat' + echo 'installed: /usr/local/bin/xray' + echo 'installed: /usr/local/lib/xray/geoip.dat' + echo 'installed: /usr/local/lib/xray/geosite.dat' if [ "$CONFDIR" -eq '1' ]; then - echo 'installed: /usr/local/etc/v2ray/00_log.json' - echo 'installed: /usr/local/etc/v2ray/01_api.json' - echo 'installed: /usr/local/etc/v2ray/02_dns.json' - echo 'installed: /usr/local/etc/v2ray/03_routing.json' - echo 'installed: /usr/local/etc/v2ray/04_policy.json' - echo 'installed: /usr/local/etc/v2ray/05_inbounds.json' - echo 'installed: /usr/local/etc/v2ray/06_outbounds.json' - echo 'installed: /usr/local/etc/v2ray/07_transport.json' - echo 'installed: /usr/local/etc/v2ray/08_stats.json' - echo 'installed: /usr/local/etc/v2ray/09_reverse.json' + echo 'installed: /usr/local/etc/xray/00_log.json' + echo 'installed: /usr/local/etc/xray/01_api.json' + echo 'installed: /usr/local/etc/xray/02_dns.json' + echo 'installed: /usr/local/etc/xray/03_routing.json' + echo 'installed: /usr/local/etc/xray/04_policy.json' + echo 'installed: /usr/local/etc/xray/05_inbounds.json' + echo 'installed: /usr/local/etc/xray/06_outbounds.json' + echo 'installed: /usr/local/etc/xray/07_transport.json' + echo 'installed: /usr/local/etc/xray/08_stats.json' + echo 'installed: /usr/local/etc/xray/09_reverse.json' fi if [ "$LOG" -eq '1' ]; then - echo 'installed: /var/log/v2ray/' + echo 'installed: /var/log/xray/' fi if [ "$OPENRC" -eq '1' ]; then - echo 'installed: /etc/init.d/v2ray' + echo 'installed: /etc/init.d/xray' fi rm -r "$TMP_DIRECTORY" echo "removed: $TMP_DIRECTORY" echo "You may need to execute a command to remove dependent software: apk del curl unzip" - if [ "$V2RAY_RUNNING" -eq '1' ]; then - rc-service v2ray start + if [ "$XRAY_RUNNING" -eq '1' ]; then + rc-service xray start else - echo 'Please execute the command: rc-update add v2ray; rc-service v2ray start' + echo 'Please execute the command: rc-update add xray; rc-service xray start' fi - echo "info: V2Ray is installed." + echo "info: Xray is installed." } main() { install_software install_software - download_v2ray - verification_v2ray + download_xray + verification_xray decompression is_it_running - install_v2ray + install_xray install_confdir install_log install_startup_service_file From 00974924bf81bc892729dc845a23940e4086ad4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E3=81=AE=E3=81=8B=E3=81=88=E3=81=A7?= Date: Sun, 4 Apr 2021 09:22:15 +0800 Subject: [PATCH 22/33] docs: add English and Chinese Simplified --- README.md | 22 ++++++++++--------- README_zh-cn.md | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ README_zh-tw.md | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 10 deletions(-) create mode 100644 README_zh-cn.md create mode 100644 README_zh-tw.md diff --git a/README.md b/README.md index fdf5c7a..26694b3 100644 --- a/README.md +++ b/README.md @@ -1,52 +1,54 @@ # alpinelinux-install-xray -## 依賴軟體 +English | [中文(中国)](README_zh-cn.md) | [中文(薹灣)](README_zh-tw.md) -### 安裝 cURL +## Install dependencies + +### Install cURL ``` # apk add curl ``` -## 下載 +## Download ``` $ curl -O https://raw.githubusercontent.com/XTLS/alpinelinux-install-xray/main/install-release.sh ``` -## 使用 +## Use ``` # ash install-release.sh ``` -## 管理指令 +## Commands -### 啟用 +### Enable ``` # rc-update add xray ``` -### 禁用 +### Disable ``` # rc-update del xray ``` -### 啟動 +### Start ``` # rc-service xray start ``` -### 關閉 +### Stop ``` # rc-service xray stop ``` -### 重啟 +### Restart ``` # rc-service xray restart diff --git a/README_zh-cn.md b/README_zh-cn.md new file mode 100644 index 0000000..6d16bd1 --- /dev/null +++ b/README_zh-cn.md @@ -0,0 +1,56 @@ +# alpinelinux-install-xray + +[English](README.md) | 中文(中国) | [中文(薹灣)](README_zh-tw.md) + + +## 依赖软件 + +### 安装 cURL + +``` +# apk add curl +``` + +## 下载 + +``` +$ curl -O https://raw.githubusercontent.com/XTLS/alpinelinux-install-xray/main/install-release.sh +``` + +## 使用 + +``` +# ash install-release.sh +``` + +## 管理命令 + +### 启用 + +``` +# rc-update add xray +``` + +### 禁用 + +``` +# rc-update del xray +``` + +### 启动 + +``` +# rc-service xray start +``` + +### 关闭 + +``` +# rc-service xray stop +``` + +### 重启 + +``` +# rc-service xray restart +``` diff --git a/README_zh-tw.md b/README_zh-tw.md new file mode 100644 index 0000000..5f59e65 --- /dev/null +++ b/README_zh-tw.md @@ -0,0 +1,56 @@ +# alpinelinux-install-xray + +[English](README.md) | [中文(中国)](README_zh-cn.md) | 中文(薹灣) + + +## 依賴軟體 + +### 安裝 cURL + +``` +# apk add curl +``` + +## 下載 + +``` +$ curl -O https://raw.githubusercontent.com/XTLS/alpinelinux-install-xray/main/install-release.sh +``` + +## 使用 + +``` +# ash install-release.sh +``` + +## 管理指令 + +### 啟用 + +``` +# rc-update add xray +``` + +### 禁用 + +``` +# rc-update del xray +``` + +### 啟動 + +``` +# rc-service xray start +``` + +### 關閉 + +``` +# rc-service xray stop +``` + +### 重啟 + +``` +# rc-service xray restart +``` From cfddeb5115a92fd3bbfffc24d4c06ecdd3fc448d Mon Sep 17 00:00:00 2001 From: Markson Hon <50002150+MarksonHon@users.noreply.github.com> Date: Sun, 5 Feb 2023 16:37:07 +0800 Subject: [PATCH 23/33] Fix SHA --- install-release.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/install-release.sh b/install-release.sh index 9bccc4b..bdf03d4 100644 --- a/install-release.sh +++ b/install-release.sh @@ -87,14 +87,12 @@ download_xray() { } verification_xray() { - for LISTSUM in 'md5' 'sha1' 'sha256' 'sha512'; do - SUM="$(${LISTSUM}sum $ZIP_FILE | sed 's/ .*//')" - CHECKSUM="$(grep $(echo $LISTSUM | tr [:lower:] [:upper:]) $ZIP_FILE.dgst | uniq | sed 's/.* //')" - if [ "$SUM" != "$CHECKSUM" ]; then - echo 'error: Check failed! Please check your network or try again.' - exit 1 - fi - done + CHECKSUM=$(cat "$ZIP_FILE".dgst | awk -F '= ' '/256=/ {print $2}') + LOCALSUM=$(sha256sum "$ZIP_FILE" | awk '{printf $1}') + if [[ "$CHECKSUM" != "$LOCALSUM" ]]; then + echo 'error: SHA256 check failed! Please check your network or try again.' + return 1 + fi } decompression() { From 25dc8d65423fac9aacbf37d0878dd53cfcf71f5f Mon Sep 17 00:00:00 2001 From: winds365 Date: Sun, 9 Mar 2025 09:15:31 +0800 Subject: [PATCH 24/33] Update install-release.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改路径，跟https://github.com/XTLS/Xray-install保持一致 --- install-release.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/install-release.sh b/install-release.sh index bdf03d4..2e982a7 100644 --- a/install-release.sh +++ b/install-release.sh @@ -109,9 +109,9 @@ is_it_running() { install_xray() { install -m 755 "${TMP_DIRECTORY}xray" "/usr/local/bin/xray" - install -d /usr/local/lib/xray/ - install -m 755 "${TMP_DIRECTORY}geoip.dat" "/usr/local/lib/xray/geoip.dat" - install -m 755 "${TMP_DIRECTORY}geosite.dat" "/usr/local/lib/xray/geosite.dat" + install -d /usr/local/share/xray/ + install -m 755 "${TMP_DIRECTORY}geoip.dat" "/usr/local/share/xray/geoip.dat" + install -m 755 "${TMP_DIRECTORY}geosite.dat" "/usr/local/share/xray/geosite.dat" } install_confdir() { @@ -151,8 +151,8 @@ install_startup_service_file() { information() { echo 'installed: /usr/local/bin/xray' - echo 'installed: /usr/local/lib/xray/geoip.dat' - echo 'installed: /usr/local/lib/xray/geosite.dat' + echo 'installed: /usr/local/share/xray/geoip.dat' + echo 'installed: /usr/local/share/xray/geosite.dat' if [ "$CONFDIR" -eq '1' ]; then echo 'installed: /usr/local/etc/xray/00_log.json' echo 'installed: /usr/local/etc/xray/01_api.json' From 167d978e964263e1f3000639e0dcee3d21b3421a Mon Sep 17 00:00:00 2001 From: winds365 Date: Sun, 9 Mar 2025 09:20:05 +0800 Subject: [PATCH 25/33] Update xray --- init.d/xray | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/init.d/xray b/init.d/xray index be0eb0a..d6d9e1e 100644 --- a/init.d/xray +++ b/init.d/xray @@ -1,23 +1,22 @@ #!/sbin/openrc-run +supervisor=supervise-daemon name="Xray" description="The best v2ray-core, with XTLS support" description_checkconfig="Test configuration file" -: ${env:="XRAY_LOCATION_ASSET=/usr/local/lib/xray/"} +: ${env:="XRAY_LOCATION_ASSET=/usr/local/share/xray/"} : ${confdir:="/usr/local/etc/xray/"} command="/usr/local/bin/xray" command_args="run -confdir $confdir" command_user="nobody" - -pidfile="/run/xray.pid" -command_background="yes" - extra_commands="checkconfig" +capabilities="^cap_net_bind_service" depend() { - need net + need net localmount + after firewall } checkconfig() { @@ -26,9 +25,12 @@ checkconfig() { return 1 fi export $env - $command $command_args -test + su ${command_user%:*} -s /bin/sh -c "$command $command_args -test" + eend $? } -start_pre() { - checkconfig +stop_pre() { + if [ "$RC_CMD" = restart ]; then + checkconfig || return $? + fi } From fbd34ea6dbd9b1f0781b4246f1f9b4dc2e988ecf Mon Sep 17 00:00:00 2001 From: Meo597 <197331664+Meo597@users.noreply.github.com> Date: Thu, 10 Apr 2025 03:25:10 +0800 Subject: [PATCH 26/33] Rewrite OpenRC --- README.md | 23 +++++++++++++++++++++++ README_zh-cn.md | 24 +++++++++++++++++++++++- README_zh-tw.md | 24 +++++++++++++++++++++++- init.d/xray | 48 ++++++++++++++++++++++++------------------------ 4 files changed, 93 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 26694b3..0bd00bb 100644 --- a/README.md +++ b/README.md @@ -53,3 +53,26 @@ $ curl -O https://raw.githubusercontent.com/XTLS/alpinelinux-install-xray/main/i ``` # rc-service xray restart ``` + +### Breaking Changes at 2025-04-09 + +#### Path Change: Original path `/usr/local/lib/xray/` has been updated to new path `/usr/local/share/xray/` + +- This directory contains `geosite.dat` and `geoip.dat` +- If you have scripts to automatically update these files, please adjust them accordingly +- Regular users can ignore this change + +#### Watchdog: Xray process will now automatically restart indefinitely (every 2 seconds) upon panic + +- Advanced users no longer need to manually modify `/etc/init.d/xray` or write custom daemon scripts +- Regular users can ignore this change + +#### No `root` Required: Xray now retains privileges (capabilities) to support `tproxy` and `sockopt` even when running as `nobody` + +- Advanced users **should not** (and need not) run Xray as `root` anymore — it already has all required network privileges +- If you run Xray as a **server** (not client), you _may_ optionally run the command below to reduce capabilities. This theoretically minimizes attack surface but has negligible practical impact +- Regular users can ignore this change + +```sh +sed -i 's/^capabilities="cap_net_bind_service,cap_net_admin,cap_net_raw"$/capabilities="cap_net_bind_service"/g' /etc/init.d/xray +``` diff --git a/README_zh-cn.md b/README_zh-cn.md index 6d16bd1..35bb132 100644 --- a/README_zh-cn.md +++ b/README_zh-cn.md @@ -2,7 +2,6 @@ [English](README.md) | 中文(中国) | [中文(薹灣)](README_zh-tw.md) - ## 依赖软件 ### 安装 cURL @@ -54,3 +53,26 @@ $ curl -O https://raw.githubusercontent.com/XTLS/alpinelinux-install-xray/main/i ``` # rc-service xray restart ``` + +### 重大更改 at 2025-04-09 + +#### 路径变更：原路径 `/usr/local/lib/xray/` 变更为 新路径 `/usr/local/share/xray/` + +- 此目录存放了 `geosite.dat` 和 `geoip.dat` +- 如果你编写了一些脚本来自动更新这些文件，需要留意此项改动 +- 普通用户无需关注此改动 + +#### 看门狗：若 Xray 进程 `panic` 将无限自动重启，间隔 2 秒 + +- 对于高级用户，你无需再手动调整 `/etc/init.d/xray` 或自己编写 daemon 脚本了 +- 普通用户无需关注此改动 + +#### 无需 `root`：已为 Xray 授予特权，即便以 `nobody` 身份运行也支持 `tproxy` 和 `sockopt` + +- 对于高级用户，你无需、也**不应该**再让 Xray 以 `root` 身份运行，现在它们已具备所有网络特权 +- 如果你的 Xray 作为**节点**而不是客户端运行，或*可考虑*执行下面的命令撤销部分网络特权。理论上可以降低攻击面，实际上无关痛痒 +- 普通用户无需关注此改动 + +```sh +sed -i 's/^capabilities="cap_net_bind_service,cap_net_admin,cap_net_raw"$/capabilities="cap_net_bind_service"/g' /etc/init.d/xray +``` diff --git a/README_zh-tw.md b/README_zh-tw.md index 5f59e65..13a096c 100644 --- a/README_zh-tw.md +++ b/README_zh-tw.md @@ -2,7 +2,6 @@ [English](README.md) | [中文(中国)](README_zh-cn.md) | 中文(薹灣) - ## 依賴軟體 ### 安裝 cURL @@ -54,3 +53,26 @@ $ curl -O https://raw.githubusercontent.com/XTLS/alpinelinux-install-xray/main/i ``` # rc-service xray restart ``` + +### 重大變更 at 2025-04-09 + +#### 路徑變更：原始路徑 `/usr/local/lib/xray/` 變更為 新路徑 `/usr/local/share/xray/` + +- 此目錄存放了 `geosite.dat` 和 `geoip.dat` +- 如果你編寫了一些腳本來自動更新這些文件，需要留意此項改動 +- 普通用戶無需關注此改動 + +#### 看門狗：若 Xray 進程 `panic` 將無限自動重啟，間隔 2 秒 + +- 對於高級用戶，你無需再手動調整 `/etc/init.d/xray` 或自己編寫 daemon 腳本了 +- 普通用戶無需關注此改動 + +#### 無需 `root`：已為 Xray 授予特權，即便以 `nobody` 身分執行也支援 `tproxy` 和 `sockopt` + +- 對於高級用戶，你無需、也**不應該**再讓 Xray 以 `root` 身份運行，現在它們已具備所有網絡特權 +- 如果你的 Xray 是作為**節點**而不是客戶端運行，或*可考慮*執行下面的命令撤銷部分網路特權。理論上可以降低攻擊面，實際上無關痛癢 +- 普通用戶無需關注此改動 + +```sh +sed -i 's/^capabilities="cap_net_bind_service,cap_net_admin,cap_net_raw"$/capabilities="cap_net_bind_service"/g' /etc/init.d/xray +``` diff --git a/init.d/xray b/init.d/xray index d6d9e1e..397c411 100644 --- a/init.d/xray +++ b/init.d/xray @@ -1,36 +1,36 @@ #!/sbin/openrc-run + +name="Xray Daemon" +description="A unified platform for anti-censorship" + supervisor=supervise-daemon +respawn_delay=2 +respawn_max=0 -name="Xray" -description="The best v2ray-core, with XTLS support" -description_checkconfig="Test configuration file" - -: ${env:="XRAY_LOCATION_ASSET=/usr/local/share/xray/"} -: ${confdir:="/usr/local/etc/xray/"} - -command="/usr/local/bin/xray" -command_args="run -confdir $confdir" -command_user="nobody" +pidfile="/run/${RC_SVCNAME}.pid" +rc_ulimit="-n 1024000 -u 1024000" +capabilities="cap_net_bind_service,cap_net_admin,cap_net_raw" extra_commands="checkconfig" -capabilities="^cap_net_bind_service" + +env=${env:-"XRAY_LOCATION_ASSET=/usr/local/share/xray/"} # See: https://github.com/XTLS/Xray-core/blob/main/common/platform/platform.go +confdir=${confdir:-"/usr/local/etc/xray/"} +command="/usr/local/bin/xray" +command_user="nobody:nobody" +command_args="run -confdir $confdir" +required_files="$confdir" depend() { - need net localmount - after firewall + need net + want dns ntp-client + after firewall } checkconfig() { - if [ ! -d "$confdir" ]; then - eerror "You need to setup $confdir first" - return 1 - fi - export $env - su ${command_user%:*} -s /bin/sh -c "$command $command_args -test" - eend $? + export $env + $command $command_args -test + eend $? } -stop_pre() { - if [ "$RC_CMD" = restart ]; then - checkconfig || return $? - fi +start_pre() { + checkconfig || return 1 } From de845d521d59568afcbbe150e846479f9f93820b Mon Sep 17 00:00:00 2001 From: Meo597 <197331664+Meo597@users.noreply.github.com> Date: Thu, 10 Apr 2025 03:54:41 +0800 Subject: [PATCH 27/33] cap: daemon with ambient and inheritable --- init.d/xray | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.d/xray b/init.d/xray index 397c411..93d526c 100644 --- a/init.d/xray +++ b/init.d/xray @@ -9,7 +9,7 @@ respawn_max=0 pidfile="/run/${RC_SVCNAME}.pid" rc_ulimit="-n 1024000 -u 1024000" -capabilities="cap_net_bind_service,cap_net_admin,cap_net_raw" +capabilities="^cap_net_bind_service,^cap_net_admin,^cap_net_raw" extra_commands="checkconfig" env=${env:-"XRAY_LOCATION_ASSET=/usr/local/share/xray/"} # See: https://github.com/XTLS/Xray-core/blob/main/common/platform/platform.go From 53829b0663b9848b0762a31245fdc560466b1321 Mon Sep 17 00:00:00 2001 From: Meo597 <197331664+Meo597@users.noreply.github.com> Date: Thu, 10 Apr 2025 04:16:12 +0800 Subject: [PATCH 28/33] Fix README --- README.md | 30 +++++++++++++++--------------- README_zh-cn.md | 30 +++++++++++++++--------------- README_zh-tw.md | 30 +++++++++++++++--------------- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/README.md b/README.md index 0bd00bb..a894ae4 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ English | [中文(中国)](README_zh-cn.md) | [中文(薹灣)](README_zh-tw.md) ### Install cURL -``` -# apk add curl +```sh +apk add curl ``` ## Download @@ -18,43 +18,43 @@ $ curl -O https://raw.githubusercontent.com/XTLS/alpinelinux-install-xray/main/i ## Use -``` -# ash install-release.sh +```sh +ash install-release.sh ``` ## Commands ### Enable -``` -# rc-update add xray +```sh +rc-update add xray ``` ### Disable -``` -# rc-update del xray +```sh +rc-update del xray ``` ### Start -``` -# rc-service xray start +```sh +rc-service xray start ``` ### Stop -``` -# rc-service xray stop +```sh +rc-service xray stop ``` ### Restart -``` -# rc-service xray restart +```sh +rc-service xray restart ``` -### Breaking Changes at 2025-04-09 +## Breaking Changes at 2025-04-09 #### Path Change: Original path `/usr/local/lib/xray/` has been updated to new path `/usr/local/share/xray/` diff --git a/README_zh-cn.md b/README_zh-cn.md index 35bb132..46fda13 100644 --- a/README_zh-cn.md +++ b/README_zh-cn.md @@ -6,8 +6,8 @@ ### 安装 cURL -``` -# apk add curl +```sh +apk add curl ``` ## 下载 @@ -18,43 +18,43 @@ $ curl -O https://raw.githubusercontent.com/XTLS/alpinelinux-install-xray/main/i ## 使用 -``` -# ash install-release.sh +```sh +ash install-release.sh ``` ## 管理命令 ### 启用 -``` -# rc-update add xray +```sh +rc-update add xray ``` ### 禁用 -``` -# rc-update del xray +```sh +rc-update del xray ``` ### 启动 -``` -# rc-service xray start +```sh +rc-service xray start ``` ### 关闭 -``` -# rc-service xray stop +```sh +rc-service xray stop ``` ### 重启 -``` -# rc-service xray restart +```sh +rc-service xray restart ``` -### 重大更改 at 2025-04-09 +## 重大更改 at 2025-04-09 #### 路径变更：原路径 `/usr/local/lib/xray/` 变更为 新路径 `/usr/local/share/xray/` diff --git a/README_zh-tw.md b/README_zh-tw.md index 13a096c..c6e3477 100644 --- a/README_zh-tw.md +++ b/README_zh-tw.md @@ -6,8 +6,8 @@ ### 安裝 cURL -``` -# apk add curl +```sh +apk add curl ``` ## 下載 @@ -18,43 +18,43 @@ $ curl -O https://raw.githubusercontent.com/XTLS/alpinelinux-install-xray/main/i ## 使用 -``` -# ash install-release.sh +```sh +ash install-release.sh ``` ## 管理指令 ### 啟用 -``` -# rc-update add xray +```sh +rc-update add xray ``` ### 禁用 -``` -# rc-update del xray +```sh +rc-update del xray ``` ### 啟動 -``` -# rc-service xray start +```sh +rc-service xray start ``` ### 關閉 -``` -# rc-service xray stop +```sh +rc-service xray stop ``` ### 重啟 -``` -# rc-service xray restart +```sh +rc-service xray restart ``` -### 重大變更 at 2025-04-09 +## 重大變更 at 2025-04-09 #### 路徑變更：原始路徑 `/usr/local/lib/xray/` 變更為 新路徑 `/usr/local/share/xray/` From 34d38c70e7f16f034ae9951014d81f6e57993054 Mon Sep 17 00:00:00 2001 From: Meo597 <197331664+Meo597@users.noreply.github.com> Date: Thu, 10 Apr 2025 04:26:44 +0800 Subject: [PATCH 29/33] Use tab --- init.d/xray | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/init.d/xray b/init.d/xray index 93d526c..7e1b443 100644 --- a/init.d/xray +++ b/init.d/xray @@ -20,17 +20,17 @@ command_args="run -confdir $confdir" required_files="$confdir" depend() { - need net - want dns ntp-client - after firewall + need net + want dns ntp-client + after firewall } checkconfig() { - export $env - $command $command_args -test - eend $? + export $env + $command $command_args -test + eend $? } start_pre() { - checkconfig || return 1 + checkconfig || return 1 } From 3b1c099ea6e333941d19976f39778a790b56193a Mon Sep 17 00:00:00 2001 From: Meo597 <197331664+Meo597@users.noreply.github.com> Date: Thu, 10 Apr 2025 19:42:17 +0800 Subject: [PATCH 30/33] Fix README --- README.md | 2 +- README_zh-cn.md | 2 +- README_zh-tw.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a894ae4..24093b0 100644 --- a/README.md +++ b/README.md @@ -74,5 +74,5 @@ rc-service xray restart - Regular users can ignore this change ```sh -sed -i 's/^capabilities="cap_net_bind_service,cap_net_admin,cap_net_raw"$/capabilities="cap_net_bind_service"/g' /etc/init.d/xray +sed -i 's/^capabilities="^cap_net_bind_service,^cap_net_admin,^cap_net_raw"$/capabilities="^cap_net_bind_service"/g' /etc/init.d/xray ``` diff --git a/README_zh-cn.md b/README_zh-cn.md index 46fda13..e22c193 100644 --- a/README_zh-cn.md +++ b/README_zh-cn.md @@ -74,5 +74,5 @@ rc-service xray restart - 普通用户无需关注此改动 ```sh -sed -i 's/^capabilities="cap_net_bind_service,cap_net_admin,cap_net_raw"$/capabilities="cap_net_bind_service"/g' /etc/init.d/xray +sed -i 's/^capabilities="^cap_net_bind_service,^cap_net_admin,^cap_net_raw"$/capabilities="^cap_net_bind_service"/g' /etc/init.d/xray ``` diff --git a/README_zh-tw.md b/README_zh-tw.md index c6e3477..0fa31ad 100644 --- a/README_zh-tw.md +++ b/README_zh-tw.md @@ -74,5 +74,5 @@ rc-service xray restart - 普通用戶無需關注此改動 ```sh -sed -i 's/^capabilities="cap_net_bind_service,cap_net_admin,cap_net_raw"$/capabilities="cap_net_bind_service"/g' /etc/init.d/xray +sed -i 's/^capabilities="^cap_net_bind_service,^cap_net_admin,^cap_net_raw"$/capabilities="^cap_net_bind_service"/g' /etc/init.d/xray ``` From f87ea25b6b257beb853281b4c59d9fbdfb374ebc Mon Sep 17 00:00:00 2001 From: Meo597 <197331664+Meo597@users.noreply.github.com> Date: Thu, 10 Apr 2025 19:58:33 +0800 Subject: [PATCH 31/33] respawn period --- init.d/xray | 1 + 1 file changed, 1 insertion(+) diff --git a/init.d/xray b/init.d/xray index 7e1b443..6eecf74 100644 --- a/init.d/xray +++ b/init.d/xray @@ -6,6 +6,7 @@ description="A unified platform for anti-censorship" supervisor=supervise-daemon respawn_delay=2 respawn_max=0 +respawn_period=0 pidfile="/run/${RC_SVCNAME}.pid" rc_ulimit="-n 1024000 -u 1024000" From 0776561190b2cab5c1adc7ad246afb0f9c31a67a Mon Sep 17 00:00:00 2001 From: Meo597 <197331664+Meo597@users.noreply.github.com> Date: Thu, 10 Apr 2025 20:08:47 +0800 Subject: [PATCH 32/33] Fix README --- README.md | 4 ++-- README_zh-cn.md | 4 ++-- README_zh-tw.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 24093b0..3920058 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ apk add curl ## Download -``` -$ curl -O https://raw.githubusercontent.com/XTLS/alpinelinux-install-xray/main/install-release.sh +```sh +curl -O https://raw.githubusercontent.com/XTLS/alpinelinux-install-xray/main/install-release.sh ``` ## Use diff --git a/README_zh-cn.md b/README_zh-cn.md index e22c193..368d4cb 100644 --- a/README_zh-cn.md +++ b/README_zh-cn.md @@ -12,8 +12,8 @@ apk add curl ## 下载 -``` -$ curl -O https://raw.githubusercontent.com/XTLS/alpinelinux-install-xray/main/install-release.sh +```sh +curl -O https://raw.githubusercontent.com/XTLS/alpinelinux-install-xray/main/install-release.sh ``` ## 使用 diff --git a/README_zh-tw.md b/README_zh-tw.md index 0fa31ad..fec8d9c 100644 --- a/README_zh-tw.md +++ b/README_zh-tw.md @@ -12,8 +12,8 @@ apk add curl ## 下載 -``` -$ curl -O https://raw.githubusercontent.com/XTLS/alpinelinux-install-xray/main/install-release.sh +```sh +curl -O https://raw.githubusercontent.com/XTLS/alpinelinux-install-xray/main/install-release.sh ``` ## 使用 From c3798e5dcd920b2cc38f46c90bc09a7192d250c0 Mon Sep 17 00:00:00 2001 From: Meo597 <197331664+Meo597@users.noreply.github.com> Date: Thu, 10 Apr 2025 20:47:41 +0800 Subject: [PATCH 33/33] daemon: 3 panic in 10 minutes stops service --- README.md | 2 +- README_zh-cn.md | 2 +- README_zh-tw.md | 2 +- init.d/xray | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3920058..2198e0a 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ rc-service xray restart - If you have scripts to automatically update these files, please adjust them accordingly - Regular users can ignore this change -#### Watchdog: Xray process will now automatically restart indefinitely (every 2 seconds) upon panic +#### Watchdog: Xray process will now automatically restart indefinitely (every 5 seconds) upon panic, unless it panic 3 times in 10 minutes - Advanced users no longer need to manually modify `/etc/init.d/xray` or write custom daemon scripts - Regular users can ignore this change diff --git a/README_zh-cn.md b/README_zh-cn.md index 368d4cb..4f04fec 100644 --- a/README_zh-cn.md +++ b/README_zh-cn.md @@ -62,7 +62,7 @@ rc-service xray restart - 如果你编写了一些脚本来自动更新这些文件，需要留意此项改动 - 普通用户无需关注此改动 -#### 看门狗：若 Xray 进程 `panic` 将无限自动重启，间隔 2 秒 +#### 看门狗：若 Xray 进程 `panic` 将无限自动重启，间隔 5 秒，除非 10 分钟内崩溃 3 次 - 对于高级用户，你无需再手动调整 `/etc/init.d/xray` 或自己编写 daemon 脚本了 - 普通用户无需关注此改动 diff --git a/README_zh-tw.md b/README_zh-tw.md index fec8d9c..3c88222 100644 --- a/README_zh-tw.md +++ b/README_zh-tw.md @@ -62,7 +62,7 @@ rc-service xray restart - 如果你編寫了一些腳本來自動更新這些文件，需要留意此項改動 - 普通用戶無需關注此改動 -#### 看門狗：若 Xray 進程 `panic` 將無限自動重啟，間隔 2 秒 +#### 看門狗：若 Xray 進程 `panic` 將無限自動重啟，間隔 5 秒，除非 10 分鐘內崩潰 3 次 - 對於高級用戶，你無需再手動調整 `/etc/init.d/xray` 或自己編寫 daemon 腳本了 - 普通用戶無需關注此改動 diff --git a/init.d/xray b/init.d/xray index 6eecf74..aece55b 100644 --- a/init.d/xray +++ b/init.d/xray @@ -4,9 +4,9 @@ name="Xray Daemon" description="A unified platform for anti-censorship" supervisor=supervise-daemon -respawn_delay=2 -respawn_max=0 -respawn_period=0 +respawn_delay=5 +respawn_max=2 +respawn_period=600 pidfile="/run/${RC_SVCNAME}.pid" rc_ulimit="-n 1024000 -u 1024000"