From 8387d287a9be2fb09d83da9e4ebf3670e83562ba Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Sat, 15 Jul 2023 15:07:42 +0000 Subject: [PATCH 01/30] feat: add contribution guidelines --- CODE_OF_CONDUCT.md | 134 +++++++++++++++++++++++++++++++++++++++++++++ CONTRIBUTING.md | 6 ++ 2 files changed, 140 insertions(+) create mode 100644 CODE_OF_CONDUCT.md create mode 100644 CONTRIBUTING.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..d33878e --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,134 @@ + +# Contributor Covenant Code of Conduct + +## Our Pledge + +We as members, contributors, and leaders pledge to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socio-economic status, +nationality, personal appearance, race, caste, color, religion, or sexual +identity and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, +diverse, inclusive, and healthy community. + +## Our Standards + +Examples of behavior that contributes to a positive environment for our +community include: + +* Demonstrating empathy and kindness toward other people +* Being respectful of differing opinions, viewpoints, and experiences +* Giving and gracefully accepting constructive feedback +* Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +* Focusing on what is best not just for us as individuals, but for the overall + community + +Examples of unacceptable behavior include: + +* The use of sexualized language or imagery, and sexual attention or advances of + any kind +* Trolling, insulting or derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or email address, + without their explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Enforcement Responsibilities + +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. + +Community leaders have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, and will communicate reasons for moderation +decisions when appropriate. + +## Scope + +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official e-mail address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported to the community leaders responsible for enforcement at +[INSERT CONTACT METHOD]. +All complaints will be reviewed and investigated promptly and fairly. + +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed +unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing +clarity around the nature of the violation and an explanation of why the +behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series of +actions. + +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or permanent +ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within the +community. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], +version 2.1, available at +[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1]. + +Community Impact Guidelines were inspired by +[Mozilla's code of conduct enforcement ladder][Mozilla CoC]. + +For answers to common questions about this code of conduct, see the FAQ at +[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at +[https://www.contributor-covenant.org/translations][translations]. + +[homepage]: https://www.contributor-covenant.org +[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html +[Mozilla CoC]: https://github.com/mozilla/diversity +[FAQ]: https://www.contributor-covenant.org/faq +[translations]: https://www.contributor-covenant.org/translations + diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..a600ba8 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,6 @@ +# Contribution Guidelines + +Thank you for contributing to winapps! Before you can contribute, we ask some things of you: + +- Please follow our Code of Conduct, the Contributor Covenant. You can find a copy in this repository or under https://www.contributor-covenant.org/ +- All Contributors have to sign [a CLA](https://gist.github.com/oskardotglobal/35f0a72eb45fcc7087e535561383dbc5) for legal reasons. When opening a PR, @cla-assitant will prompt you and guide you through the process. However, if you contribute on behalf of a legal entity, we ask of you to sign [a different CLA](https://gist.github.com/oskardotglobal/75a8cc056e56a439fa6a1551129ae47f). In that case, please contact us. \ No newline at end of file From 8841b93f45c7cd8fde3002b44514d2c2fc5575b7 Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Sat, 15 Jul 2023 15:58:16 +0000 Subject: [PATCH 02/30] feat: add GPLv3 --- 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 796aeac892d62df97b9fb329f2006a0cbca96964 Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Wed, 28 Aug 2024 12:14:46 +0200 Subject: [PATCH 03/30] feat: rename installer.sh to setup.sh --- README.md | 4 ++-- docs/docker.md | 2 +- docs/libvirt.md | 2 +- installer.sh => setup.sh | 18 +++++++++--------- 4 files changed, 13 insertions(+), 13 deletions(-) rename installer.sh => setup.sh (98%) diff --git a/README.md b/README.md index da62a1f..93902f7 100644 --- a/README.md +++ b/README.md @@ -443,10 +443,10 @@ FREERDP_COMMAND="" ### Step 4: Run the WinApps Installer Run the WinApps installer. ```bash -./installer.sh +./setup.sh ``` -A list of supported additional arguments can be accessed by running `./installer.sh --help`. +A list of supported additional arguments can be accessed by running `./setup.sh --help`. WinApps Installer Animation. diff --git a/docs/docker.md b/docs/docker.md index 7a070d0..afb1ba8 100644 --- a/docs/docker.md +++ b/docs/docker.md @@ -56,7 +56,7 @@ docker compose --file ~/.config/winapps/compose.yaml up > Since no Windows user password is set by default, Windows may automatically log in, which may cause the WinApps installation to fail due to complications establishing an RDP connection. To avoid this issue, please use the VNC connection to ensure that the Windows user is logged out before starting the WinApps installation. ```bash -./installer.sh +./setup.sh ``` ### Changing `compose.yaml` diff --git a/docs/libvirt.md b/docs/libvirt.md index 992819e..3e24d18 100644 --- a/docs/libvirt.md +++ b/docs/libvirt.md @@ -679,5 +679,5 @@ You may now proceed to install other applications like 'Microsoft 365', 'Adobe C Finally, restart the virtual machine, but **DO NOT** log in. Close the virtual machine viewer and proceed to run the WinApps installation. ```bash -./installer.sh +./setup.sh ``` diff --git a/installer.sh b/setup.sh similarity index 98% rename from installer.sh rename to setup.sh index 60a9b39..e878442 100755 --- a/installer.sh +++ b/setup.sh @@ -125,13 +125,13 @@ function waTerminateScript() { # Role: Displays usage information for the script. function waUsage() { echo -e "Usage: - ${COMMAND_TEXT}./installer.sh --user${CLEAR_TEXT} # Install WinApps and selected applications in ${HOME} - ${COMMAND_TEXT}./installer.sh --system${CLEAR_TEXT} # Install WinApps and selected applications in /usr - ${COMMAND_TEXT}./installer.sh --user --setupAllOfficiallySupportedApps${CLEAR_TEXT} # Install WinApps and all officially supported applications in ${HOME} - ${COMMAND_TEXT}./installer.sh --system --setupAllOfficiallySupportedApps${CLEAR_TEXT} # Install WinApps and all officially supported applications in /usr - ${COMMAND_TEXT}./installer.sh --user --uninstall${CLEAR_TEXT} # Uninstall everything in ${HOME} - ${COMMAND_TEXT}./installer.sh --system --uninstall${CLEAR_TEXT} # Uninstall everything in /usr - ${COMMAND_TEXT}./installer.sh --help${CLEAR_TEXT} # Display this usage message." + ${COMMAND_TEXT}./setup.sh --user${CLEAR_TEXT} # Install WinApps and selected applications in ${HOME} + ${COMMAND_TEXT}./setup.sh --system${CLEAR_TEXT} # Install WinApps and selected applications in /usr + ${COMMAND_TEXT}./setup.sh --user --setupAllOfficiallySupportedApps${CLEAR_TEXT} # Install WinApps and all officially supported applications in ${HOME} + ${COMMAND_TEXT}./setup.sh --system --setupAllOfficiallySupportedApps${CLEAR_TEXT} # Install WinApps and all officially supported applications in /usr + ${COMMAND_TEXT}./setup.sh --user --uninstall${CLEAR_TEXT} # Uninstall everything in ${HOME} + ${COMMAND_TEXT}./setup.sh --system --uninstall${CLEAR_TEXT} # Uninstall everything in /usr + ${COMMAND_TEXT}./setup.sh --help${CLEAR_TEXT} # Display this usage message." } # Name: 'waSetWorkingDirectory' @@ -349,7 +349,7 @@ function waCheckExistingInstall() { # Display the suggested action(s). echo "--------------------------------------------------------------------------------" - echo -e "Please remove the existing WinApps installation using ${COMMAND_TEXT}./installer.sh --user --uninstall${CLEAR_TEXT}." + echo -e "Please remove the existing WinApps installation using ${COMMAND_TEXT}./setup.sh --user --uninstall${CLEAR_TEXT}." echo "--------------------------------------------------------------------------------" # Terminate the script. @@ -369,7 +369,7 @@ function waCheckExistingInstall() { # Display the suggested action(s). echo "--------------------------------------------------------------------------------" - echo -e "Please remove the existing WinApps installation using ${COMMAND_TEXT}./installer.sh --system --uninstall${CLEAR_TEXT}." + echo -e "Please remove the existing WinApps installation using ${COMMAND_TEXT}./setup.sh --system --uninstall${CLEAR_TEXT}." echo "--------------------------------------------------------------------------------" # Terminate the script. From 75c20ec26c5204db2dae755099285943bb631d89 Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Wed, 28 Aug 2024 16:03:17 +0200 Subject: [PATCH 04/30] feat: simplify installation process --- README.md | 54 ++++++++++------------- setup.sh | 125 +++++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 128 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index 93902f7..9a3f227 100644 --- a/README.md +++ b/README.md @@ -284,33 +284,25 @@ The following guides are available: If you already have a Windows VM or server you wish to use with WinApps, you will need to merge `install/RDPApps.reg` into the Windows Registry manually. -### Step 2: Clone WinApps Repository and Dependencies -1. Clone the WinApps GitHub repository. - ```bash - git clone --recurse-submodules --remote-submodules https://github.com/winapps-org/winapps.git && cd winapps - ``` - -2. Install the required dependencies. - - Debian/Ubuntu: - ```bash - sudo apt install -y dialog freerdp3-x11 iproute2 libnotify-bin netcat - ``` - - Fedora/RHEL: - ```bash - sudo dnf install -y dialog freerdp iproute libnotify nmap-ncat - ``` - - Arch Linux: - ```bash - sudo pacman -Syu --needed -y dialog freerdp iproute2 libnotify gnu-netcat - ``` - - Gentoo Linux: - ```bash - sudo emerge --ask=n sys-libs/dialog net-misc/freerdp:3 net-misc/iproute2 x11-libs/libnotify net-analyzer/netcat - ``` - -- `Docker Engine`: https://docs.docker.com/engine/install/ -- `Podman`: https://podman.io/docs/installation -- `podman-compose`: https://github.com/containers/podman-compose +### Step 2: Install Dependencies +Install the required dependencies. + - Debian/Ubuntu: + ```bash + sudo apt install -y dialog freerdp3-x11 iproute2 libnotify-bin netcat + ``` + - Fedora/RHEL: + ```bash + sudo dnf install -y dialog freerdp iproute libnotify nmap-ncat + ``` + - Arch Linux: + ```bash + sudo pacman -Syu --needed -y dialog freerdp iproute2 libnotify + gnu-netcat + ``` + - Gentoo Linux: + ```bash + sudo emerge --ask=n sys-libs/dialog net-misc/freerdp:3 net-misc/iproute2 x11-libs/libnotify net-analyzer/netcat + ``` > [!NOTE] > WinApps requires `FreeRDP` version 3 or later. If not available for your distribution through your package manager, you can install the [Flatpak](https://flathub.org/apps/com.freerdp.FreeRDP). @@ -443,7 +435,7 @@ FREERDP_COMMAND="" ### Step 4: Run the WinApps Installer Run the WinApps installer. ```bash -./setup.sh +bash <(curl https://raw.githubusercontent.com/winapps-org/winapps/main/setup.sh) ``` A list of supported additional arguments can be accessed by running `./setup.sh --help`. @@ -461,15 +453,15 @@ Adding your own applications with custom icons and MIME types to the installer i WinApps offers a manual mode for running applications that were not configured by the WinApps installer. This is completed with the `manual` flag. Executables that are in the Windows PATH do not require full path definition. ```bash -./bin/winapps manual "C:\my\directory\executableNotInPath.exe" -./bin/winapps manual executableInPath.exe +winapps manual "C:\my\directory\executableNotInPath.exe" +winapps manual executableInPath.exe ``` ## Updating WinApps The installer can be run multiple times. To update your installation of WinApps: 1. Run the WinApps installer to remove WinApps from your system. 2. Pull the latest changes from the WinApps GitHub repository. -3. Re-install WinApps using the WinApps installer. +3. Re-install WinApps using the WinApps installer by running `winapps-setup`. ## Star History diff --git a/setup.sh b/setup.sh index e878442..bb51273 100755 --- a/setup.sh +++ b/setup.sh @@ -37,6 +37,9 @@ readonly EC_INVALID_FLAVOR="16" # Backend specified is not 'libvirt', 'docker' readonly SYS_BIN_PATH="/usr/local/bin" # UNIX path to 'bin' directory for a '--system' WinApps installation. readonly USER_BIN_PATH="${HOME}/.local/bin" # UNIX path to 'bin' directory for a '--user' WinApps installation. readonly USER_BIN_PATH_WIN='\\tsclient\home\.local\bin' # WINDOWS path to 'bin' directory for a '--user' WinApps installation. +# 'SOURCE' +readonly SYS_SOURCE_PATH="${SYS_BIN_PATH}/winapps" # UNIX path to WinApps source directory for a '--system' WinApps installation. +readonly USER_SOURCE_PATH="${USER_BIN_PATH}/winapps" # UNIX path to WinApps source directory for a '--system' WinApps installation. # 'APP' readonly SYS_APP_PATH="/usr/share/applications" # UNIX path to 'applications' directory for a '--system' WinApps installation. readonly USER_APP_PATH="${HOME}/.local/share/applications" # UNIX path to 'applications' directory for a '--user' WinApps installation. @@ -98,6 +101,7 @@ SUDO="" # Set to "sudo" if the user specifies '--system', or "" if the u BIN_PATH="" # Set to $SYS_BIN_PATH if the user specifies '--system', or $USER_BIN_PATH if the user specifies '--user'. APP_PATH="" # Set to $SYS_APP_PATH if the user specifies '--system', or $USER_APP_PATH if the user specifies '--user'. APPDATA_PATH="" # Set to $SYS_APPDATA_PATH if the user specifies '--system', or $USER_APPDATA_PATH if the user specifies '--user'. +SOURCE_PATH="" # Set to $SYS_SOURCE_PATH if the user specifies '--system', or $USER_SOURCE_PATH if the user specifies '--user'. # INSTALLATION PROCESS INSTALLED_EXES=() # List of executable file names of officially supported applications that have already been configured during the current installation process. @@ -134,29 +138,40 @@ function waUsage() { ${COMMAND_TEXT}./setup.sh --help${CLEAR_TEXT} # Display this usage message." } -# Name: 'waSetWorkingDirectory' -# Role: Changes the working directory to the directory containing the script. -function waSetWorkingDirectory() { +# Name: 'waGetSourceCode' +# Role: Grab the WinApps source code using Git. +function waGetSourceCode() { # Declare variables. local SCRIPT_DIR_PATH="" # Stores the absolute path of the directory containing the script. # Determine the absolute path to the directory containing the script. SCRIPT_DIR_PATH=$(readlink -f "$(dirname "${BASH_SOURCE[0]}")") + # Check if winapps is currently installed on $SOURCE_PATH + if [[ -f "$SCRIPT_DIR_PATH/winapps" && "$SCRIPT_DIR_PATH" -ne "$SOURCE_PATH" ]]; then + # Display a warning. + echo -e "${WARNING_TEXT}[WARNING]${CLEAR_TEXT} You are running a WinApps installation located outside of default location '${SOURCE_PATH}'. A new installation will be created." + echo -e "${WARNING_TEXT}[WARNING]${CLEAR_TEXT} You might want to remove your old installation on '${SCRIPT_DIR_PATH}'." + fi + + if [[ ! -d "$SOURCE_PATH" ]]; then + $SUDO git clone --recurse-submodules --remote-submodules https://github.com/winapps-org/winapps.git "$SOURCE_PATH" + fi + # Silently change the working directory. - if ! cd "$SCRIPT_DIR_PATH" &>/dev/null; then + if ! cd "$SOURCE_PATH" &>/dev/null; then # Display the error type. echo -e "${ERROR_TEXT}ERROR:${CLEAR_TEXT} ${BOLD_TEXT}DIRECTORY CHANGE FAILURE.${CLEAR_TEXT}" # Display error details. - echo -e "${INFO_TEXT}Failed to change the working directory to ${CLEAR_TEXT}${COMMAND_TEXT}${SCRIPT_DIR_PATH}${CLEAR_TEXT}${INFO_TEXT}.${CLEAR_TEXT}" + echo -e "${INFO_TEXT}Failed to change the working directory to ${CLEAR_TEXT}${COMMAND_TEXT}${SOURCE_PATH}${CLEAR_TEXT}${INFO_TEXT}.${CLEAR_TEXT}" # Display the suggested action(s). echo "--------------------------------------------------------------------------------" echo "Ensure:" - echo -e " - ${COMMAND_TEXT}${SCRIPT_DIR_PATH}${CLEAR_TEXT} exists." - echo -e " - ${COMMAND_TEXT}${SCRIPT_DIR_PATH}${CLEAR_TEXT} is valid and does not contain syntax errors." - echo -e " - The current user has sufficient permissions to access ${COMMAND_TEXT}${SCRIPT_DIR_PATH}${CLEAR_TEXT}." + echo -e " - ${COMMAND_TEXT}${SOURCE_PATH}${CLEAR_TEXT} exists." + echo -e " - ${COMMAND_TEXT}${SOURCE_PATH}${CLEAR_TEXT} has been cloned and checked out properly." + echo -e " - The current user has sufficient permissions to access and write to ${COMMAND_TEXT}${SOURCE_PATH}${CLEAR_TEXT}." echo "--------------------------------------------------------------------------------" # Terminate the script. @@ -301,11 +316,13 @@ function waCheckInput() { function waConfigurePathsAndPermissions() { if [ "$OPT_USER" -eq 1 ]; then SUDO="" + SOURCE_PATH="$USER_SOURCE_PATH" BIN_PATH="$USER_BIN_PATH" APP_PATH="$USER_APP_PATH" APPDATA_PATH="$USER_APPDATA_PATH" elif [ "$OPT_SYSTEM" -eq 1 ]; then SUDO="sudo" + SOURCE_PATH="$SYS_SOURCE_PATH" BIN_PATH="$SYS_BIN_PATH" APP_PATH="$SYS_APP_PATH" APPDATA_PATH="$SYS_APPDATA_PATH" @@ -337,7 +354,7 @@ function waCheckExistingInstall() { echo -n "Checking for existing conflicting WinApps installations... " # Check for an existing 'user' installation. - if [ -f "${USER_BIN_PATH}/winapps" ]; then + if [[ -f "${USER_BIN_PATH}/winapps" || -d "${USER_SOURCE_PATH}/winapps" ]]; then # Complete the previous line. echo -e "${FAIL_TEXT}Failed!${CLEAR_TEXT}\n" @@ -357,7 +374,7 @@ function waCheckExistingInstall() { fi # Check for an existing 'system' installation. - if [ -f "${SYS_BIN_PATH}/winapps" ]; then + if [[ -f "${SYS_BIN_PATH}/winapps" || -d "${USER_SOURCE_PATH}/winapps" ]]; then # Complete the previous line. echo -e "${FAIL_TEXT}Failed!${CLEAR_TEXT}\n" @@ -450,6 +467,54 @@ function waLoadConfig() { # Name: 'waCheckScriptDependencies' # Role: Terminate script if dependencies are missing. function waCheckScriptDependencies() { + # 'Git' + if ! command -v git &>/dev/null; then + # Display the error type. + echo -e "${ERROR_TEXT}ERROR:${CLEAR_TEXT} ${BOLD_TEXT}MISSING DEPENDENCIES.${CLEAR_TEXT}" + + # Display the error details. + echo -e "${INFO_TEXT}Please install 'git' to proceed.${CLEAR_TEXT}" + + # Display the suggested action(s). + echo "--------------------------------------------------------------------------------" + echo "Debian/Ubuntu-based systems:" + echo -e " ${COMMAND_TEXT}sudo apt install git${CLEAR_TEXT}" + echo "Red Hat/Fedora-based systems:" + echo -e " ${COMMAND_TEXT}sudo dnf install git${CLEAR_TEXT}" + echo "Arch Linux systems:" + echo -e " ${COMMAND_TEXT}sudo pacman -S git${CLEAR_TEXT}" + echo "Gentoo Linux systems:" + echo -e " ${COMMAND_TEXT}sudo emerge --ask dev-vcs/git${CLEAR_TEXT}" + echo "--------------------------------------------------------------------------------" + + # Terminate the script. + return "$EC_MISSING_DEPS" + fi + + # 'curl' + if ! command -v curl &>/dev/null; then + # Display the error type. + echo -e "${ERROR_TEXT}ERROR:${CLEAR_TEXT} ${BOLD_TEXT}MISSING DEPENDENCIES.${CLEAR_TEXT}" + + # Display the error details. + echo -e "${INFO_TEXT}Please install 'curl' to proceed.${CLEAR_TEXT}" + + # Display the suggested action(s). + echo "--------------------------------------------------------------------------------" + echo "Debian/Ubuntu-based systems:" + echo -e " ${COMMAND_TEXT}sudo apt install curl${CLEAR_TEXT}" + echo "Red Hat/Fedora-based systems:" + echo -e " ${COMMAND_TEXT}sudo dnf install curl${CLEAR_TEXT}" + echo "Arch Linux systems:" + echo -e " ${COMMAND_TEXT}sudo pacman -S curl${CLEAR_TEXT}" + echo "Gentoo Linux systems:" + echo -e " ${COMMAND_TEXT}sudo emerge --ask net-misc/curl${CLEAR_TEXT}" + echo "--------------------------------------------------------------------------------" + + # Terminate the script. + return "$EC_MISSING_DEPS" + fi + # 'Dialog'. if ! command -v dialog &>/dev/null; then # Display the error type. @@ -852,7 +917,7 @@ function waCheckContainerRunning() { # Display the suggested action(s). echo "--------------------------------------------------------------------------------" echo "Please ensure Windows is powered on:" - echo -e "${COMMAND_TEXT}${COMPOSE_COMMAND} --file ~/.config/winapps/winapps.conf start${CLEAR_TEXT}" + echo -e "${COMMAND_TEXT}${COMPOSE_COMMAND} --file ~/.config/winapps/compose.yaml start${CLEAR_TEXT}" echo "--------------------------------------------------------------------------------" # Terminate the script. @@ -1469,6 +1534,9 @@ function waInstall() { # Check for missing dependencies. waCheckInstallDependencies + # Get the source code + waGetSourceCode + # Update $MULTI_FLAG. if [[ $MULTIMON == "true" ]]; then MULTI_FLAG="/multimon" @@ -1536,8 +1604,9 @@ function waInstall() { # Check for installed applications. waFindInstalled - # Install the WinApps bash script. - $SUDO cp "./bin/winapps" "${BIN_PATH}/winapps" + # Install the WinApps bash scripts. + $SUDO ln -s "./bin/winapps" "${BIN_PATH}/winapps" + $SUDO ln -s "./setup.sh" "${BIN_PATH}/winapps-setup" # Configure the Windows RDP session application launcher. waConfigureWindows @@ -1553,10 +1622,27 @@ function waInstall() { waConfigureDetectedApps fi + # Ensure BIN_PATH is on PATH + waEnsureOnPath + # Print feedback. echo -e "${SUCCESS_TEXT}INSTALLATION COMPLETE.${CLEAR_TEXT}" } +# Name: 'waEnsureOnPath' +# Role: Ensures that $BIN_PATH is on $PATH. +function waEnsureOnPath() { + if [[ ":$PATH:" == *":$BIN_PATH:"* ]]; then + echo -e "${WARNING_TEXT}[WARNING]${CLEAR_TEXT} It seems like '${BIN_PATH}' is not on PATH." + echo -e "${WARNING_TEXT}[WARNING]${CLEAR_TEXT} You can add it by running:" + # shellcheck disable=SC2086 + echo -e "${WARNING_TEXT}[WARNING]${CLEAR_TEXT} - For Bash: ${COMMAND_TEXT}echo 'export PATH="${BIN_PATH}:\$PATH"' >> ~/.bashrc${CLEAR_TEXT}" + # shellcheck disable=SC2086 + echo -e "${WARNING_TEXT}[WARNING]${CLEAR_TEXT} - For ZSH: ${COMMAND_TEXT}echo 'export PATH="${BIN_PATH}:\$PATH"' >> ~/.zshrc${CLEAR_TEXT}" + echo -e "${WARNING_TEXT}[WARNING]${CLEAR_TEXT} Make sure to restart your Terminal afterwards.\n" + fi +} + # Name: 'waUninstall' # Role: Uninstalls WinApps. function waUninstall() { @@ -1570,8 +1656,9 @@ function waUninstall() { local DESKTOP_FILE_NAME="" # Stores the name of the '.desktop' file for the application. local BASH_SCRIPT_NAME="" # Stores the name of the application. - # Remove the 'WinApps' bash script. + # Remove the 'WinApps' bash scripts. $SUDO rm -f "${BIN_PATH}/winapps" + $SUDO rm -f "${BIN_PATH}/winapps-setup" # Remove WinApps configuration data, temporary files and logs. rm -rf "$USER_APPDATA_PATH" @@ -1622,9 +1709,10 @@ function waUninstall() { done # Print caveats. - echo -e "\n${INFO_TEXT}Please note your WinApps configuration folder was not removed.${CLEAR_TEXT}" - echo -e "${INFO_TEXT}You can remove this manually by running:${CLEAR_TEXT}" - echo -e "${COMMAND_TEXT}rm -r $(dirname "$CONFIG_PATH")${CLEAR_TEXT}\n" + echo -e "\n${INFO_TEXT}Please note that your WinApps configuration and the WinApps source code were not removed.${CLEAR_TEXT}" + echo -e "${INFO_TEXT}You can remove these manually by running:${CLEAR_TEXT}" + echo -e "${COMMAND_TEXT}rm -r $(dirname "$CONFIG_PATH")${CLEAR_TEXT}" + echo -e "${COMMAND_TEXT}rm -r ${SOURCE_PATH}${CLEAR_TEXT}\n" # Print feedback. echo -e "${SUCCESS_TEXT}UNINSTALLATION COMPLETE.${CLEAR_TEXT}" @@ -1647,9 +1735,6 @@ waCheckScriptDependencies # shellcheck source=/dev/null # Exclude this file from being checked by ShellCheck. source "$INQUIRER_PATH" -# Set the working directory. -waSetWorkingDirectory - # Sanitise and parse the user input. waCheckInput "$@" From 81fbf01147a3abf15e13a7dddad465f852101ad3 Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Wed, 28 Aug 2024 16:12:31 +0200 Subject: [PATCH 05/30] fix: no need for curl --- setup.sh | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/setup.sh b/setup.sh index bb51273..391fe61 100755 --- a/setup.sh +++ b/setup.sh @@ -491,30 +491,6 @@ function waCheckScriptDependencies() { return "$EC_MISSING_DEPS" fi - # 'curl' - if ! command -v curl &>/dev/null; then - # Display the error type. - echo -e "${ERROR_TEXT}ERROR:${CLEAR_TEXT} ${BOLD_TEXT}MISSING DEPENDENCIES.${CLEAR_TEXT}" - - # Display the error details. - echo -e "${INFO_TEXT}Please install 'curl' to proceed.${CLEAR_TEXT}" - - # Display the suggested action(s). - echo "--------------------------------------------------------------------------------" - echo "Debian/Ubuntu-based systems:" - echo -e " ${COMMAND_TEXT}sudo apt install curl${CLEAR_TEXT}" - echo "Red Hat/Fedora-based systems:" - echo -e " ${COMMAND_TEXT}sudo dnf install curl${CLEAR_TEXT}" - echo "Arch Linux systems:" - echo -e " ${COMMAND_TEXT}sudo pacman -S curl${CLEAR_TEXT}" - echo "Gentoo Linux systems:" - echo -e " ${COMMAND_TEXT}sudo emerge --ask net-misc/curl${CLEAR_TEXT}" - echo "--------------------------------------------------------------------------------" - - # Terminate the script. - return "$EC_MISSING_DEPS" - fi - # 'Dialog'. if ! command -v dialog &>/dev/null; then # Display the error type. From 6ab6a45987f97839798b4a9fd874949e113bb466 Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Wed, 28 Aug 2024 16:14:47 +0200 Subject: [PATCH 06/30] fix: use curl-bash format in vm docs --- docs/docker.md | 2 +- docs/libvirt.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/docker.md b/docs/docker.md index afb1ba8..b03a4ca 100644 --- a/docs/docker.md +++ b/docs/docker.md @@ -56,7 +56,7 @@ docker compose --file ~/.config/winapps/compose.yaml up > Since no Windows user password is set by default, Windows may automatically log in, which may cause the WinApps installation to fail due to complications establishing an RDP connection. To avoid this issue, please use the VNC connection to ensure that the Windows user is logged out before starting the WinApps installation. ```bash -./setup.sh +bash <(curl https://raw.githubusercontent.com/winapps-org/winapps/main/setup.sh) ``` ### Changing `compose.yaml` diff --git a/docs/libvirt.md b/docs/libvirt.md index 3e24d18..165cad3 100644 --- a/docs/libvirt.md +++ b/docs/libvirt.md @@ -679,5 +679,5 @@ You may now proceed to install other applications like 'Microsoft 365', 'Adobe C Finally, restart the virtual machine, but **DO NOT** log in. Close the virtual machine viewer and proceed to run the WinApps installation. ```bash -./setup.sh +bash <(curl https://raw.githubusercontent.com/winapps-org/winapps/main/setup.sh) ``` From 95ba3209c9dba925c58653d8d57cecd42916f49c Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Thu, 29 Aug 2024 12:29:31 +0200 Subject: [PATCH 07/30] fix: always clone repo since inquirer requires it --- setup.sh | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/setup.sh b/setup.sh index 391fe61..5c6fe81 100755 --- a/setup.sh +++ b/setup.sh @@ -156,6 +156,9 @@ function waGetSourceCode() { if [[ ! -d "$SOURCE_PATH" ]]; then $SUDO git clone --recurse-submodules --remote-submodules https://github.com/winapps-org/winapps.git "$SOURCE_PATH" + else + echo -e "${INFO_TEXT}WinApps installation already present at ${CLEAR_TEXT}${COMMAND_TEXT}${SOURCE_PATH}${CLEAR_TEXT}${INFO_TEXT}. Updating...${CLEAR_TEXT}" + $SUDO git -C "$SOURCE_PATH" pull --no-rebase fi # Silently change the working directory. @@ -374,7 +377,7 @@ function waCheckExistingInstall() { fi # Check for an existing 'system' installation. - if [[ -f "${SYS_BIN_PATH}/winapps" || -d "${USER_SOURCE_PATH}/winapps" ]]; then + if [[ -f "${SYS_BIN_PATH}/winapps" || -d "${SYS_SOURCE_PATH}/winapps" ]]; then # Complete the previous line. echo -e "${FAIL_TEXT}Failed!${CLEAR_TEXT}\n" @@ -491,6 +494,30 @@ function waCheckScriptDependencies() { return "$EC_MISSING_DEPS" fi + # 'curl' + if ! command -v curl &>/dev/null; then + # Display the error type. + echo -e "${ERROR_TEXT}ERROR:${CLEAR_TEXT} ${BOLD_TEXT}MISSING DEPENDENCIES.${CLEAR_TEXT}" + + # Display the error details. + echo -e "${INFO_TEXT}Please install 'curl' to proceed.${CLEAR_TEXT}" + + # Display the suggested action(s). + echo "--------------------------------------------------------------------------------" + echo "Debian/Ubuntu-based systems:" + echo -e " ${COMMAND_TEXT}sudo apt install curl${CLEAR_TEXT}" + echo "Red Hat/Fedora-based systems:" + echo -e " ${COMMAND_TEXT}sudo dnf install curl${CLEAR_TEXT}" + echo "Arch Linux systems:" + echo -e " ${COMMAND_TEXT}sudo pacman -S curl${CLEAR_TEXT}" + echo "Gentoo Linux systems:" + echo -e " ${COMMAND_TEXT}sudo emerge --ask net-misc/curl${CLEAR_TEXT}" + echo "--------------------------------------------------------------------------------" + + # Terminate the script. + return "$EC_MISSING_DEPS" + fi + # 'Dialog'. if ! command -v dialog &>/dev/null; then # Display the error type. @@ -1510,9 +1537,6 @@ function waInstall() { # Check for missing dependencies. waCheckInstallDependencies - # Get the source code - waGetSourceCode - # Update $MULTI_FLAG. if [[ $MULTIMON == "true" ]]; then MULTI_FLAG="/multimon" @@ -1707,6 +1731,9 @@ ${CLEAR_TEXT}" # Check dependencies for the script. waCheckScriptDependencies +# Get the source code +waGetSourceCode + # Source the contents of 'inquirer.sh'. # shellcheck source=/dev/null # Exclude this file from being checked by ShellCheck. source "$INQUIRER_PATH" From 4e0d582101cee041df6d381e5df74d219eb6ce41 Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Fri, 30 Aug 2024 13:01:05 +0200 Subject: [PATCH 08/30] fix: load inquirer even if repo isn't cloned yet --- setup.sh | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/setup.sh b/setup.sh index 5c6fe81..59f7bb8 100755 --- a/setup.sh +++ b/setup.sh @@ -182,6 +182,18 @@ function waGetSourceCode() { fi } +# Name: 'waGetInquirer' +# Role: Loads the inquirer script, even if the source isn't cloned yet +function waGetInquirer() { + if [[ ! -d "$SYS_SOURCE_PATH" || ! -d "$USER_SOURCE_PATH" ]]; then + INQUIRER_PATH="/tmp/waInquirer.sh" + curl "https://raw.githubusercontent.com/winapps-org/winapps/main/install/inquirer.sh" -O "$INQUIRER_PATH" + fi + + # shellcheck source=/dev/null # Exclude this file from being checked by ShellCheck. + source "$INQUIRER_PATH" +} + # Name: 'waCheckInput' # Role: Sanitises input and guides users through selecting appropriate options if no arguments are provided. function waCheckInput() { @@ -1731,12 +1743,8 @@ ${CLEAR_TEXT}" # Check dependencies for the script. waCheckScriptDependencies -# Get the source code -waGetSourceCode - # Source the contents of 'inquirer.sh'. -# shellcheck source=/dev/null # Exclude this file from being checked by ShellCheck. -source "$INQUIRER_PATH" +waGetInquirer # Sanitise and parse the user input. waCheckInput "$@" @@ -1744,6 +1752,9 @@ waCheckInput "$@" # Configure paths and permissions. waConfigurePathsAndPermissions +# Get the source code +waGetSourceCode + # Install or uninstall WinApps. if [ "$OPT_UNINSTALL" -eq 1 ]; then waUninstall From 81b8b13b33661c227629a9b462535856d44e0ca8 Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Fri, 30 Aug 2024 14:02:57 +0200 Subject: [PATCH 09/30] fix: bad logic & remove inquirer if exists --- setup.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.sh b/setup.sh index 59f7bb8..2487dd7 100755 --- a/setup.sh +++ b/setup.sh @@ -185,8 +185,10 @@ function waGetSourceCode() { # Name: 'waGetInquirer' # Role: Loads the inquirer script, even if the source isn't cloned yet function waGetInquirer() { - if [[ ! -d "$SYS_SOURCE_PATH" || ! -d "$USER_SOURCE_PATH" ]]; then + if [ ! -d "$SYS_SOURCE_PATH" ] && [ ! -d "$USER_SOURCE_PATH" ]; then INQUIRER_PATH="/tmp/waInquirer.sh" + rm -f "$INQUIRER_PATH" + curl "https://raw.githubusercontent.com/winapps-org/winapps/main/install/inquirer.sh" -O "$INQUIRER_PATH" fi From 7408fc103c37b7013195c32ac184b6cb2883ced1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 12:05:07 +0000 Subject: [PATCH 10/30] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.sh b/setup.sh index 2487dd7..8362ffb 100755 --- a/setup.sh +++ b/setup.sh @@ -188,7 +188,7 @@ function waGetInquirer() { if [ ! -d "$SYS_SOURCE_PATH" ] && [ ! -d "$USER_SOURCE_PATH" ]; then INQUIRER_PATH="/tmp/waInquirer.sh" rm -f "$INQUIRER_PATH" - + curl "https://raw.githubusercontent.com/winapps-org/winapps/main/install/inquirer.sh" -O "$INQUIRER_PATH" fi From ace4075b847d01eac569bc4475f7b40fd841d7e0 Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Fri, 30 Aug 2024 15:24:06 +0200 Subject: [PATCH 11/30] fix: use proper and --- setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.sh b/setup.sh index 8362ffb..a7c1361 100755 --- a/setup.sh +++ b/setup.sh @@ -148,7 +148,7 @@ function waGetSourceCode() { SCRIPT_DIR_PATH=$(readlink -f "$(dirname "${BASH_SOURCE[0]}")") # Check if winapps is currently installed on $SOURCE_PATH - if [[ -f "$SCRIPT_DIR_PATH/winapps" && "$SCRIPT_DIR_PATH" -ne "$SOURCE_PATH" ]]; then + if [ -f "$SCRIPT_DIR_PATH/winapps" ] && [ "$SCRIPT_DIR_PATH" -ne "$SOURCE_PATH" ]; then # Display a warning. echo -e "${WARNING_TEXT}[WARNING]${CLEAR_TEXT} You are running a WinApps installation located outside of default location '${SOURCE_PATH}'. A new installation will be created." echo -e "${WARNING_TEXT}[WARNING]${CLEAR_TEXT} You might want to remove your old installation on '${SCRIPT_DIR_PATH}'." From 02b0f2856c8ecf1914b42bba06bd94327907d913 Mon Sep 17 00:00:00 2001 From: Martin Date: Mon, 2 Sep 2024 00:29:29 +0200 Subject: [PATCH 12/30] README.md: Rename KDE Plasma shorthand to the correct `Plasma` --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index da62a1f..2898bb6 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

-Run Windows applications (including [Microsoft 365](https://www.microsoft365.com/) and [Adobe Creative Cloud](https://www.adobe.com/creativecloud.html)) on GNU/Linux with `KDE`, `GNOME` or `XFCE`, integrated seamlessly as if they were native to the OS. +Run Windows applications (including [Microsoft 365](https://www.microsoft365.com/) and [Adobe Creative Cloud](https://www.adobe.com/creativecloud.html)) on GNU/Linux with `Plasma`, `GNOME` or `XFCE`, integrated seamlessly as if they were native to the OS.

WinApps Demonstration.

From 916c1e6bd8d1572f1fd63763b725965d9428ef32 Mon Sep 17 00:00:00 2001 From: Rohan Barar Date: Mon, 2 Sep 2024 10:00:59 +1000 Subject: [PATCH 13/30] Fixed #223 --- docs/libvirt.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/libvirt.md b/docs/libvirt.md index 992819e..8b5818b 100644 --- a/docs/libvirt.md +++ b/docs/libvirt.md @@ -52,6 +52,19 @@ Together, these components form a powerful and flexible virtualization stack, wi sudo reboot # Reboot the system to ensure the user is added to the relevant groups. ``` + Note: Due to a known bug in `rpm-ostree`, which affects various distributions such as Silverblue, Bazzite, Bluefin, Kinoite, Aurora, UCore, and others, the commands provided earlier may not properly add your user to all required groups. If the `groups $USER` command does not show your user as being part of the necessary groups, you'll need to manually add these groups to `/etc/group` if they are present in `/usr/lib/group`. + + To resolve this: + 1. Identify which groups are missing from the output of `groups $USER`. + 2. Use the following snippet to add each missing group to `/etc/group`. Ensure you replace "kvm" with the name of the missing group. + + ```bash + grep -E '^kvm:' /usr/lib/group | sudo tee -a /etc/group + sudo usermod -aG kvm $USER + ``` + + 3. Reboot your system to ensure that the user is correctly added to the relevant groups. + 6. If relevant to your distribution, disable `AppArmor` for the `libvirt` daemon. ``` bash sudo ln -s /etc/apparmor.d/usr.sbin.libvirtd /etc/apparmor.d/disable/ # Disable AppArmor for the libvirt daemon by creating a symbolic link. From a5ae665582d065b08ebc7f79639dcad06671402e Mon Sep 17 00:00:00 2001 From: Rohan Barar Date: Mon, 2 Sep 2024 10:15:15 +1000 Subject: [PATCH 14/30] Clarified OOBE\BYPASSNRO Instructions --- docs/libvirt.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/libvirt.md b/docs/libvirt.md index 8b5818b..a1541fa 100644 --- a/docs/libvirt.md +++ b/docs/libvirt.md @@ -596,21 +596,20 @@ Once you get to the point of selecting the location for installation, you will s

-The next hurdle will be bypassing the network selection screen. As the `VirtIO` drivers -for networking have not yet been loaded, the virtual machine will not be able to be connected to the internet. -- For Windows 11: Press "Shift + F10" to open the command prompt. Type 'OOBE\BYPASSNRO' (without the surrounding quotation marks) and press Enter. The system will restart and now allow you to click `I don't have internet`. +The next hurdle will be bypassing the network selection screen. As the `VirtIO` drivers for networking have not yet been loaded, the virtual machine will not be able to be connected to the internet. +- For Windows 11: When prompted to select your country or region, press "Shift + F10" to open the command prompt. Enter `OOBE\BYPASSNRO` and press Enter. The system will restart, allowing you to select "I don't have internet" later on. It is crucial to run this command as soon as possible, as doing so later in the installation process will not work, and you may be required to create a Microsoft account despite not having an internet connection.

-- For Windows 10: Simply click `I don't have internet`. +- For Windows 10: Simply click "I don't have internet".

-Following the above, choose to `Continue with limited setup`. +Following the above, choose to "Continue with limited setup".

From 08cd44f17b92dd427828ad7a9b58a6b988d62ff7 Mon Sep 17 00:00:00 2001 From: Rohan Barar Date: Mon, 2 Sep 2024 10:34:18 +1000 Subject: [PATCH 15/30] Added Fallback Shared Folder Configuration Instructions --- docs/libvirt.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docs/libvirt.md b/docs/libvirt.md index a1541fa..43b6c75 100644 --- a/docs/libvirt.md +++ b/docs/libvirt.md @@ -680,6 +680,24 @@ Scroll down to `Remote Desktop`, and enable `Enable Remote Desktop`. At this point, you will need to restart the Windows virtual machine. +## Configuring a Fallback Shared Folder +When connecting to Windows through FreeRDP, your home folder will be shared automatically. However, this sharing setup does not apply when using Windows via virt-manager. To configure a fallback shared folder, follow these steps: + +1. Navigate to "Virtual Hardware Details", then "Memory" and then check the box for "Enable shared memory". + +2. Add filesystem hardware by going to "Virtual Hardware Details" and selecting "Add Hardware" followed by "Filesystem". Choose `virtiofs` as the driver, enter the path to the shared folder, and provide a name for the shared folder in the target path (e.g., "Windows Shared Folder"). + +3. Install [`WinFSP`](https://github.com/winfsp/winfsp/releases/) on Windows. + +4. Enable and start a 'VirtIO Filesystem' service within Windows by running the following commands within a PowerShell prompt. + ```PowerShell + sc.exe create VirtioFsSvc binpath= "C:\Program Files\Virtio-Win\VioFS\virtiofs.exe" start=auto depend="WinFsp.Launcher/VirtioFsDrv" DisplayName="Virtio Filesystem Service" + sc.exe start VirtioFsSvc + ``` + +5. Reboot Windows. + +## Installing Windows Software and Configuring WinApps You may now proceed to install other applications like 'Microsoft 365', 'Adobe Creative Cloud' or any other applications you would like to use through WinApps. > [!NOTE] From 1c35e76f25fb342bf21ca80c23955d7b0834d98c Mon Sep 17 00:00:00 2001 From: Rohan Barar Date: Mon, 2 Sep 2024 10:49:06 +1000 Subject: [PATCH 16/30] Added Static IP Address Configuration Instructions --- docs/libvirt.md | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/docs/libvirt.md b/docs/libvirt.md index 43b6c75..6019c05 100644 --- a/docs/libvirt.md +++ b/docs/libvirt.md @@ -680,7 +680,7 @@ Scroll down to `Remote Desktop`, and enable `Enable Remote Desktop`. At this point, you will need to restart the Windows virtual machine. -## Configuring a Fallback Shared Folder +## (Optional) Configuring a Fallback Shared Folder When connecting to Windows through FreeRDP, your home folder will be shared automatically. However, this sharing setup does not apply when using Windows via virt-manager. To configure a fallback shared folder, follow these steps: 1. Navigate to "Virtual Hardware Details", then "Memory" and then check the box for "Enable shared memory". @@ -697,6 +697,41 @@ When connecting to Windows through FreeRDP, your home folder will be shared auto 5. Reboot Windows. +## (Optional) Configuring a Static IP Address +1. Identify the Windows MAC address. + ```bash + virsh dumpxml "RDPWindows" | grep "mac address" + ``` + +2. Edit the virtual network configuration. + 1. Identify the correct network name. + ```bash + virsh net-list # Will likely return "default" + ``` + + 2. Edit the configuration file. + ```bash + virsh net-edit "default" # Replace "default" with the appropriate network name if different + ``` + + 3. Update the `` section in the configuration file using the MAC address you obtained earlier. In the below example, "RDPWindows" has MAC address "df:87:4c:75:e5:fb" and is assigned the static IP address "192.168.122.2". + ```xml + + + + + + + ``` + + 4. Restart the virtual network. + ```bash + virsh net-destroy "default" # Replace with the correct name on your system + virsh net-start "default" # Replace with the correct name on your system + ``` + + 5. Reboot Windows. + ## Installing Windows Software and Configuring WinApps You may now proceed to install other applications like 'Microsoft 365', 'Adobe Creative Cloud' or any other applications you would like to use through WinApps. From f2afc993391a3a5f00ee9f6cf764393a8880db8f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 00:52:15 +0000 Subject: [PATCH 17/30] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- docs/libvirt.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/libvirt.md b/docs/libvirt.md index 6019c05..3865044 100644 --- a/docs/libvirt.md +++ b/docs/libvirt.md @@ -729,7 +729,7 @@ When connecting to Windows through FreeRDP, your home folder will be shared auto virsh net-destroy "default" # Replace with the correct name on your system virsh net-start "default" # Replace with the correct name on your system ``` - + 5. Reboot Windows. ## Installing Windows Software and Configuring WinApps From e224e233ccb79c823f2516e06b8c52ca1d605a38 Mon Sep 17 00:00:00 2001 From: Rohan Barar Date: Mon, 2 Sep 2024 12:09:44 +1000 Subject: [PATCH 18/30] Implement Exec Path Check in ExtractPrograms.ps1 --- install/ExtractPrograms.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/install/ExtractPrograms.ps1 b/install/ExtractPrograms.ps1 index b1587ea..85939e8 100644 --- a/install/ExtractPrograms.ps1 +++ b/install/ExtractPrograms.ps1 @@ -192,7 +192,9 @@ function AppSearchWinReg { # Get corresponding application names for unique installed executable files. foreach ($exePath in $exePaths) { - $exeNames += GetApplicationName -exePath $exePath + if (Test-Path -Path $exePath) { + $exeNames += GetApplicationName -exePath $exePath + } } # Process extracted executable file paths. From 3a0acff38fe9a0f413f309ae039714234f2fb37f Mon Sep 17 00:00:00 2001 From: Rohan Barar Date: Mon, 2 Sep 2024 12:15:02 +1000 Subject: [PATCH 19/30] Revise Exec Path Check in ExtractPrograms.ps1 --- install/ExtractPrograms.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/install/ExtractPrograms.ps1 b/install/ExtractPrograms.ps1 index 85939e8..5662f16 100644 --- a/install/ExtractPrograms.ps1 +++ b/install/ExtractPrograms.ps1 @@ -180,6 +180,7 @@ function AppSearchWinReg { # Initialise empty arrays. $exeNames = @() $exePaths = @() + $validPaths = @() # Query windows registry for unique installed executable files. $exePaths = Get-ItemProperty "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\*" | @@ -193,12 +194,13 @@ function AppSearchWinReg { # Get corresponding application names for unique installed executable files. foreach ($exePath in $exePaths) { if (Test-Path -Path $exePath) { + $validPaths += $exePath $exeNames += GetApplicationName -exePath $exePath } } # Process extracted executable file paths. - PrintArrayData -Names $exeNames -Paths $exePaths -Source "winreg" + PrintArrayData -Names $exeNames -Paths $validPaths -Source "winreg" } # Name: 'AppSearchUWP' From df688076b5fc6f2233df809aef8ec600f6a4e01a Mon Sep 17 00:00:00 2001 From: Rohan Barar Date: Mon, 2 Sep 2024 19:24:10 +1000 Subject: [PATCH 20/30] Changed 'Plasma' to 'KDE Plasma' for clarity. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2898bb6..454666d 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

-Run Windows applications (including [Microsoft 365](https://www.microsoft365.com/) and [Adobe Creative Cloud](https://www.adobe.com/creativecloud.html)) on GNU/Linux with `Plasma`, `GNOME` or `XFCE`, integrated seamlessly as if they were native to the OS. +Run Windows applications (including [Microsoft 365](https://www.microsoft365.com/) and [Adobe Creative Cloud](https://www.adobe.com/creativecloud.html)) on GNU/Linux with `KDE Plasma`, `GNOME` or `XFCE`, integrated seamlessly as if they were native to the OS.

WinApps Demonstration.

From 0efbd5818cd820df2ca8d43a0f8858beb4f9bd0f Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Wed, 4 Sep 2024 16:27:48 +0200 Subject: [PATCH 21/30] feat: use dual-licensed unlicense --- .license-tools-config.json | 23 ++ .pre-commit-config.yaml | 5 + LICENSE | 674 ------------------------------------- LICENSE.md | 38 +++ 4 files changed, 66 insertions(+), 674 deletions(-) create mode 100644 .license-tools-config.json delete mode 100644 LICENSE create mode 100644 LICENSE.md diff --git a/.license-tools-config.json b/.license-tools-config.json new file mode 100644 index 0000000..1446525 --- /dev/null +++ b/.license-tools-config.json @@ -0,0 +1,23 @@ +{ + "author": { + "from_git": false, + "name": "winapps-org", + "latest_year_only": true + }, + "title": false, + "style_override_for_suffix": { + ".yaml": "POUND_STYLE", + ".ps1": "POUND_STYLE", + ".bat": "BATCH_STYLE", + "": "POUND_STYLE" + }, + "exclude": [ + "^\\.[^/]+", + "/\\.[^/]+", + "^(.+)\\.(md|svg|png|reg|gif)", + "^fonts(/.*)?" + ], + "license": false, + "force_license": false, + "custom_license": "SPDX-License-Identifier: Unlicense" +} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b5f2edb..4cb16d2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -48,3 +48,8 @@ repos: rev: v0.10.0.1 hooks: - id: shellcheck + + - repo: https://github.com/emzeat/mz-lictools + rev: v2.2 + hooks: + - id: license-tools diff --git a/LICENSE b/LICENSE deleted file mode 100644 index f288702..0000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - 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 -. diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..cdb1a13 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,38 @@ +This project is licensed under a dual license. + +The original project by Fmstrat is not free software. +Due to lack of a license, it is All Rights Reserved by the original author. + +We have tried contacting Fmstrat about this, but they abandoned the project and did not reply nor apply an open-source license to the project. +However, almost all parts of the codebase have been rewritten and all new contributions require a Contributor License Agreement ([for individuals](https://gist.github.com/oskardotglobal/35f0a72eb45fcc7087e535561383dbc5), [for legal entities](https://gist.github.com/oskardotglobal/75a8cc056e56a439fa6a1551129ae47f)) to be signed. +Therefore, the below license is applied to all new contributions made to the project, releasing it into the public domain. + +All source code files shall have a valid SPDX-Identifier. For more information, see . +Refer to a specific file for it's respective license. + +## The Unlicense + +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. + +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +For more information, please refer to From 6aaf7cf844ad88ae86444b9847499b08f800ae1c Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Wed, 4 Sep 2024 16:42:36 +0200 Subject: [PATCH 22/30] feat: add license information to files unchanged from old repo --- .license-tools-config.json | 1 + .pre-commit-config.yaml | 2 +- apps/access/info | 5 +++++ apps/acrobat-x-pro/info | 5 +++++ apps/adobe-cc/info | 5 +++++ apps/aftereffects-cc/info | 5 +++++ apps/audition-cc/info | 5 +++++ apps/bridge-cc/info | 5 +++++ apps/bridge-cs6-x86/info | 5 +++++ apps/bridge-cs6/info | 5 +++++ apps/cmd/info | 5 +++++ apps/excel-o365-x86/info | 5 +++++ apps/excel-o365/info | 5 +++++ apps/excel-x86/info | 5 +++++ apps/excel/info | 5 +++++ apps/explorer/info | 5 +++++ apps/iexplorer/info | 5 +++++ apps/illustrator-cc/info | 5 +++++ apps/indesign-cc/info | 5 +++++ apps/lightroom-cc/info | 5 +++++ apps/onenote-o365-x86/info | 5 +++++ apps/onenote-x86/info | 5 +++++ apps/onenote/info | 5 +++++ apps/outlook-o365-x86/info | 5 +++++ apps/outlook-x86/info | 5 +++++ apps/outlook/info | 5 +++++ apps/photoshop-cc/info | 5 +++++ apps/photoshop-cs6-x86/info | 5 +++++ apps/photoshop-cs6/info | 5 +++++ apps/powerpoint-o365-x86/info | 5 +++++ apps/powerpoint-o365/info | 5 +++++ apps/powerpoint-x86/info | 5 +++++ apps/powerpoint/info | 5 +++++ apps/powershell/info | 5 +++++ apps/project-x86/info | 5 +++++ apps/project/info | 5 +++++ apps/publisher-o365-x86/info | 5 +++++ apps/publisher-x86/info | 5 +++++ apps/publisher/info | 5 +++++ apps/visio-x86/info | 5 +++++ apps/visio/info | 5 +++++ apps/word-o365-x86/info | 5 +++++ apps/word-o365/info | 5 +++++ apps/word-x86/info | 5 +++++ apps/word/info | 5 +++++ oem/RDPApps.reg | 5 +++++ 46 files changed, 222 insertions(+), 1 deletion(-) diff --git a/.license-tools-config.json b/.license-tools-config.json index 1446525..6814762 100644 --- a/.license-tools-config.json +++ b/.license-tools-config.json @@ -18,6 +18,7 @@ "^fonts(/.*)?" ], "license": false, + "force_author": false, "force_license": false, "custom_license": "SPDX-License-Identifier: Unlicense" } diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4cb16d2..591662f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -50,6 +50,6 @@ repos: - id: shellcheck - repo: https://github.com/emzeat/mz-lictools - rev: v2.2 + rev: v2.7.0 hooks: - id: license-tools diff --git a/apps/access/info b/apps/access/info index 6a1bea4..49cc306 100644 --- a/apps/access/info +++ b/apps/access/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Access" diff --git a/apps/acrobat-x-pro/info b/apps/acrobat-x-pro/info index c3e9b58..d6c0511 100644 --- a/apps/acrobat-x-pro/info +++ b/apps/acrobat-x-pro/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Acrobat X Pro" diff --git a/apps/adobe-cc/info b/apps/adobe-cc/info index 42a62ba..492077e 100644 --- a/apps/adobe-cc/info +++ b/apps/adobe-cc/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Creative Cloud" diff --git a/apps/aftereffects-cc/info b/apps/aftereffects-cc/info index 7181324..3415312 100644 --- a/apps/aftereffects-cc/info +++ b/apps/aftereffects-cc/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="After Effects CC" diff --git a/apps/audition-cc/info b/apps/audition-cc/info index b3bdde4..b74da97 100644 --- a/apps/audition-cc/info +++ b/apps/audition-cc/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Audition CC" diff --git a/apps/bridge-cc/info b/apps/bridge-cc/info index b4a8f09..bdab33f 100644 --- a/apps/bridge-cc/info +++ b/apps/bridge-cc/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Bridge CS6" diff --git a/apps/bridge-cs6-x86/info b/apps/bridge-cs6-x86/info index 1d8cf59..d95e94f 100644 --- a/apps/bridge-cs6-x86/info +++ b/apps/bridge-cs6-x86/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Bridge CS6" diff --git a/apps/bridge-cs6/info b/apps/bridge-cs6/info index 3fa52e8..8c93499 100644 --- a/apps/bridge-cs6/info +++ b/apps/bridge-cs6/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Bridge CS6" diff --git a/apps/cmd/info b/apps/cmd/info index 08e2e87..b1dee75 100644 --- a/apps/cmd/info +++ b/apps/cmd/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Cmd" diff --git a/apps/excel-o365-x86/info b/apps/excel-o365-x86/info index 94b8372..41d26dd 100644 --- a/apps/excel-o365-x86/info +++ b/apps/excel-o365-x86/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Excel" diff --git a/apps/excel-o365/info b/apps/excel-o365/info index e0e67e5..87601ef 100644 --- a/apps/excel-o365/info +++ b/apps/excel-o365/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Excel" diff --git a/apps/excel-x86/info b/apps/excel-x86/info index bfdb56a..47c446b 100644 --- a/apps/excel-x86/info +++ b/apps/excel-x86/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Excel" diff --git a/apps/excel/info b/apps/excel/info index 9ef5cb4..4c8340a 100644 --- a/apps/excel/info +++ b/apps/excel/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Excel" diff --git a/apps/explorer/info b/apps/explorer/info index b644bc7..3417cda 100644 --- a/apps/explorer/info +++ b/apps/explorer/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Explorer" diff --git a/apps/iexplorer/info b/apps/iexplorer/info index 2da385e..a4c5216 100644 --- a/apps/iexplorer/info +++ b/apps/iexplorer/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Internet Explorer" diff --git a/apps/illustrator-cc/info b/apps/illustrator-cc/info index 58af241..906ac98 100644 --- a/apps/illustrator-cc/info +++ b/apps/illustrator-cc/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Illustrator CC" diff --git a/apps/indesign-cc/info b/apps/indesign-cc/info index 481b2dc..1b72ea7 100644 --- a/apps/indesign-cc/info +++ b/apps/indesign-cc/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="InDesign CC" diff --git a/apps/lightroom-cc/info b/apps/lightroom-cc/info index a2cdb25..3b433a2 100644 --- a/apps/lightroom-cc/info +++ b/apps/lightroom-cc/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Lightroom CC" diff --git a/apps/onenote-o365-x86/info b/apps/onenote-o365-x86/info index 335e780..3bb7c2a 100644 --- a/apps/onenote-o365-x86/info +++ b/apps/onenote-o365-x86/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="OneNote" diff --git a/apps/onenote-x86/info b/apps/onenote-x86/info index e535123..babe190 100644 --- a/apps/onenote-x86/info +++ b/apps/onenote-x86/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="OneNote" diff --git a/apps/onenote/info b/apps/onenote/info index 908f58e..1cd93d6 100644 --- a/apps/onenote/info +++ b/apps/onenote/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="OneNote" diff --git a/apps/outlook-o365-x86/info b/apps/outlook-o365-x86/info index 9a528f4..4bdd93b 100644 --- a/apps/outlook-o365-x86/info +++ b/apps/outlook-o365-x86/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Outlook" diff --git a/apps/outlook-x86/info b/apps/outlook-x86/info index 4874db3..6daead3 100644 --- a/apps/outlook-x86/info +++ b/apps/outlook-x86/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Outlook" diff --git a/apps/outlook/info b/apps/outlook/info index 43453c6..a11a448 100644 --- a/apps/outlook/info +++ b/apps/outlook/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Outlook" diff --git a/apps/photoshop-cc/info b/apps/photoshop-cc/info index a7413d6..121b374 100644 --- a/apps/photoshop-cc/info +++ b/apps/photoshop-cc/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Photoshop CC" diff --git a/apps/photoshop-cs6-x86/info b/apps/photoshop-cs6-x86/info index 16d8911..5e497a6 100644 --- a/apps/photoshop-cs6-x86/info +++ b/apps/photoshop-cs6-x86/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Photoshop CS6" diff --git a/apps/photoshop-cs6/info b/apps/photoshop-cs6/info index 24cb454..d17feb1 100644 --- a/apps/photoshop-cs6/info +++ b/apps/photoshop-cs6/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Photoshop CS6" diff --git a/apps/powerpoint-o365-x86/info b/apps/powerpoint-o365-x86/info index 755acc6..da4de9c 100644 --- a/apps/powerpoint-o365-x86/info +++ b/apps/powerpoint-o365-x86/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="PowerPoint" diff --git a/apps/powerpoint-o365/info b/apps/powerpoint-o365/info index a0d25d2..1520df7 100644 --- a/apps/powerpoint-o365/info +++ b/apps/powerpoint-o365/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="PowerPoint" diff --git a/apps/powerpoint-x86/info b/apps/powerpoint-x86/info index 21ba721..e69c572 100644 --- a/apps/powerpoint-x86/info +++ b/apps/powerpoint-x86/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="PowerPoint" diff --git a/apps/powerpoint/info b/apps/powerpoint/info index 6910809..9ae939c 100644 --- a/apps/powerpoint/info +++ b/apps/powerpoint/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="PowerPoint" diff --git a/apps/powershell/info b/apps/powershell/info index 4eca7c5..6d14321 100644 --- a/apps/powershell/info +++ b/apps/powershell/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Powershell" diff --git a/apps/project-x86/info b/apps/project-x86/info index ad1614e..4d0b099 100644 --- a/apps/project-x86/info +++ b/apps/project-x86/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Project" diff --git a/apps/project/info b/apps/project/info index d5d904b..f9596c7 100644 --- a/apps/project/info +++ b/apps/project/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Project" diff --git a/apps/publisher-o365-x86/info b/apps/publisher-o365-x86/info index 3f53e4d..0b5f62b 100644 --- a/apps/publisher-o365-x86/info +++ b/apps/publisher-o365-x86/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Publisher" diff --git a/apps/publisher-x86/info b/apps/publisher-x86/info index 871509f..cd57950 100644 --- a/apps/publisher-x86/info +++ b/apps/publisher-x86/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Publisher" diff --git a/apps/publisher/info b/apps/publisher/info index b0f305e..f754757 100644 --- a/apps/publisher/info +++ b/apps/publisher/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Publisher" diff --git a/apps/visio-x86/info b/apps/visio-x86/info index dc8a193..977fb57 100644 --- a/apps/visio-x86/info +++ b/apps/visio-x86/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Visio" diff --git a/apps/visio/info b/apps/visio/info index a7ad0be..2e1efd0 100644 --- a/apps/visio/info +++ b/apps/visio/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Visio" diff --git a/apps/word-o365-x86/info b/apps/word-o365-x86/info index b2d853d..d2146b2 100644 --- a/apps/word-o365-x86/info +++ b/apps/word-o365-x86/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Word" diff --git a/apps/word-o365/info b/apps/word-o365/info index 0632b79..a60311b 100644 --- a/apps/word-o365/info +++ b/apps/word-o365/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Word" diff --git a/apps/word-x86/info b/apps/word-x86/info index b35c54e..66c8cc0 100644 --- a/apps/word-x86/info +++ b/apps/word-x86/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Word" diff --git a/apps/word/info b/apps/word/info index a1dfd71..46c74c6 100644 --- a/apps/word/info +++ b/apps/word/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 Fmstrat +# All rights reserved. +# +# SPDX-License-Identifier: Proprietary + # GNOME shortcut name NAME="Word" diff --git a/oem/RDPApps.reg b/oem/RDPApps.reg index acb5aac..fe249b8 100644 --- a/oem/RDPApps.reg +++ b/oem/RDPApps.reg @@ -1,3 +1,8 @@ +; Copyright (c) 2024 Fmstrat +; Copyright (c) 2024 winapps-org +; All rights reserved. +; +; SPDX-License-Identifier: Proprietary Windows Registry Editor Version 5.00 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList] From 1d3e52114473b36a3f05b7f5fede9f680627050d Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Wed, 4 Sep 2024 16:48:49 +0200 Subject: [PATCH 23/30] feat: add license header to our files --- .license-tools-config.json | 45 +++++++++++++++++++++++++++++++++++- CODE_OF_CONDUCT.md | 1 - CONTRIBUTING.md | 2 +- apps/access-o365-x86/info | 5 ++++ apps/access-o365/info | 5 ++++ apps/access-x86/info | 5 ++++ apps/onenote-o365/info | 5 ++++ apps/outlook-o365/info | 5 ++++ apps/publisher-o365/info | 5 ++++ apps/visual-studio-comm/info | 5 ++++ apps/visual-studio-ent/info | 5 ++++ apps/visual-studio-pro/info | 5 ++++ bin/winapps | 4 ++++ compose.yaml | 5 ++++ install/ExtractPrograms.ps1 | 5 ++++ install/inquirer.sh | 4 ++++ installer.sh | 5 ++++ oem/install.bat | 4 ++++ 18 files changed, 117 insertions(+), 3 deletions(-) diff --git a/.license-tools-config.json b/.license-tools-config.json index 6814762..6c1d539 100644 --- a/.license-tools-config.json +++ b/.license-tools-config.json @@ -15,7 +15,50 @@ "^\\.[^/]+", "/\\.[^/]+", "^(.+)\\.(md|svg|png|reg|gif)", - "^fonts(/.*)?" + "^fonts(/.*)?", + "apps/access/info", + "apps/acrobat-x-pro/info", + "apps/adobe-cc/info", + "apps/aftereffects-cc/info", + "apps/audition-cc/info", + "apps/bridge-cc/info", + "apps/bridge-cs6-x86/info", + "apps/bridge-cs6/info", + "apps/cmd/info", + "apps/excel-o365-x86/info", + "apps/excel-o365/info", + "apps/excel-x86/info", + "apps/excel/info", + "apps/explorer/info", + "apps/iexplorer/info", + "apps/illustrator-cc/info", + "apps/indesign-cc/info", + "apps/lightroom-cc/info", + "apps/onenote-o365-x86/info", + "apps/onenote-x86/info", + "apps/onenote/info", + "apps/outlook-o365-x86/info", + "apps/outlook-x86/info", + "apps/outlook/info", + "apps/photoshop-cc/info", + "apps/photoshop-cs6-x86/info", + "apps/photoshop-cs6/info", + "apps/powerpoint-o365-x86/info", + "apps/powerpoint-o365/info", + "apps/powerpoint-x86/info", + "apps/powerpoint/info", + "apps/powershell/info", + "apps/project-x86/info", + "apps/project/info", + "apps/publisher-o365-x86/info", + "apps/publisher-x86/info", + "apps/publisher/info", + "apps/visio-x86/info", + "apps/visio/info", + "apps/word-o365-x86/info", + "apps/word-o365/info", + "apps/word-x86/info", + "apps/word/info" ], "license": false, "force_author": false, diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index d33878e..45d257b 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -131,4 +131,3 @@ For answers to common questions about this code of conduct, see the FAQ at [Mozilla CoC]: https://github.com/mozilla/diversity [FAQ]: https://www.contributor-covenant.org/faq [translations]: https://www.contributor-covenant.org/translations - diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a600ba8..60f2f7f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,4 +3,4 @@ Thank you for contributing to winapps! Before you can contribute, we ask some things of you: - Please follow our Code of Conduct, the Contributor Covenant. You can find a copy in this repository or under https://www.contributor-covenant.org/ -- All Contributors have to sign [a CLA](https://gist.github.com/oskardotglobal/35f0a72eb45fcc7087e535561383dbc5) for legal reasons. When opening a PR, @cla-assitant will prompt you and guide you through the process. However, if you contribute on behalf of a legal entity, we ask of you to sign [a different CLA](https://gist.github.com/oskardotglobal/75a8cc056e56a439fa6a1551129ae47f). In that case, please contact us. \ No newline at end of file +- All Contributors have to sign [a CLA](https://gist.github.com/oskardotglobal/35f0a72eb45fcc7087e535561383dbc5) for legal reasons. When opening a PR, @cla-assitant will prompt you and guide you through the process. However, if you contribute on behalf of a legal entity, we ask of you to sign [a different CLA](https://gist.github.com/oskardotglobal/75a8cc056e56a439fa6a1551129ae47f). In that case, please contact us. diff --git a/apps/access-o365-x86/info b/apps/access-o365-x86/info index 3c6739f..13de9d5 100644 --- a/apps/access-o365-x86/info +++ b/apps/access-o365-x86/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 winapps-org +# All rights reserved. +# +# SPDX-License-Identifier: Unlicense + # GNOME shortcut name NAME="Access" diff --git a/apps/access-o365/info b/apps/access-o365/info index cab586f..be40284 100644 --- a/apps/access-o365/info +++ b/apps/access-o365/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 winapps-org +# All rights reserved. +# +# SPDX-License-Identifier: Unlicense + # GNOME shortcut name NAME="Access" diff --git a/apps/access-x86/info b/apps/access-x86/info index d37673c..9bf0bf7 100644 --- a/apps/access-x86/info +++ b/apps/access-x86/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 winapps-org +# All rights reserved. +# +# SPDX-License-Identifier: Unlicense + # GNOME shortcut name NAME="Access" diff --git a/apps/onenote-o365/info b/apps/onenote-o365/info index 6626816..de58569 100644 --- a/apps/onenote-o365/info +++ b/apps/onenote-o365/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 winapps-org +# All rights reserved. +# +# SPDX-License-Identifier: Unlicense + # GNOME shortcut name NAME="OneNote" diff --git a/apps/outlook-o365/info b/apps/outlook-o365/info index 4763b83..379dd64 100644 --- a/apps/outlook-o365/info +++ b/apps/outlook-o365/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 winapps-org +# All rights reserved. +# +# SPDX-License-Identifier: Unlicense + # GNOME shortcut name NAME="Outlook" diff --git a/apps/publisher-o365/info b/apps/publisher-o365/info index a0466f0..728e66a 100644 --- a/apps/publisher-o365/info +++ b/apps/publisher-o365/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 winapps-org +# All rights reserved. +# +# SPDX-License-Identifier: Unlicense + # GNOME shortcut name NAME="Publisher" diff --git a/apps/visual-studio-comm/info b/apps/visual-studio-comm/info index c99a038..02504d6 100644 --- a/apps/visual-studio-comm/info +++ b/apps/visual-studio-comm/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 winapps-org +# All rights reserved. +# +# SPDX-License-Identifier: Unlicense + # GNOME shortcut name NAME="Visual Studio Community" diff --git a/apps/visual-studio-ent/info b/apps/visual-studio-ent/info index 81cc124..ad8f769 100644 --- a/apps/visual-studio-ent/info +++ b/apps/visual-studio-ent/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 winapps-org +# All rights reserved. +# +# SPDX-License-Identifier: Unlicense + # GNOME shortcut name NAME="Visual Studio Enterprise" diff --git a/apps/visual-studio-pro/info b/apps/visual-studio-pro/info index 0c08861..ac731e7 100644 --- a/apps/visual-studio-pro/info +++ b/apps/visual-studio-pro/info @@ -1,3 +1,8 @@ +# Copyright (c) 2024 winapps-org +# All rights reserved. +# +# SPDX-License-Identifier: Unlicense + # GNOME shortcut name NAME="Visual Studio Professional" diff --git a/bin/winapps b/bin/winapps index 1563955..0d39651 100755 --- a/bin/winapps +++ b/bin/winapps @@ -1,4 +1,8 @@ #!/usr/bin/env bash +# Copyright (c) 2024 winapps-org +# All rights reserved. +# +# SPDX-License-Identifier: Unlicense ### GLOBAL CONSTANTS ### # ERROR CODES diff --git a/compose.yaml b/compose.yaml index 3e77cfb..4992b51 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,3 +1,8 @@ +# Copyright (c) 2024 winapps-org +# All rights reserved. +# +# SPDX-License-Identifier: Unlicense + # For documentation, FAQ, additional configuration options and technical help, visit: https://github.com/dockur/windows name: "winapps" # Docker Compose Project Name. diff --git a/install/ExtractPrograms.ps1 b/install/ExtractPrograms.ps1 index 5662f16..87b0527 100644 --- a/install/ExtractPrograms.ps1 +++ b/install/ExtractPrograms.ps1 @@ -1,3 +1,8 @@ +# Copyright (c) 2024 winapps-org +# All rights reserved. +# +# SPDX-License-Identifier: Unlicense + ### FUNCTIONS ### # Name: 'GetApplicationIcon' # Role: Extract the icon from a given executable file as a base-64 string. diff --git a/install/inquirer.sh b/install/inquirer.sh index 881079a..2640e60 100755 --- a/install/inquirer.sh +++ b/install/inquirer.sh @@ -1,4 +1,8 @@ #!/usr/bin/env bash +# Copyright (c) 2024 winapps-org +# All rights reserved. +# +# SPDX-License-Identifier: Unlicense ### GLOBAL CONSTANTS ### declare -r ANSI_LIGHT_BLUE="\033[1;94m" # Light blue text. diff --git a/installer.sh b/installer.sh index 60a9b39..66d7ecd 100755 --- a/installer.sh +++ b/installer.sh @@ -1,4 +1,9 @@ #!/usr/bin/env bash +# Copyright (c) 2024 winapps-org +# All rights reserved. +# +# SPDX-License-Identifier: Unlicense + # shellcheck disable=SC2034 # Silence warnings regarding unused variables globally. ### GLOBAL CONSTANTS ### diff --git a/oem/install.bat b/oem/install.bat index 182423c..8fbe8d6 100644 --- a/oem/install.bat +++ b/oem/install.bat @@ -1,3 +1,7 @@ @echo off +REM Copyright (c) 2024 winapps-org +REM All rights reserved. +REM +REM SPDX-License-Identifier: Unlicense REG IMPORT C:\OEM\RDPApps.reg From eaef31089ceee636afe790ef4b7c5a6dd6a192af Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Wed, 4 Sep 2024 16:52:28 +0200 Subject: [PATCH 24/30] fix: clarify contribution guidelines --- CONTRIBUTING.md | 5 +++++ LICENSE.md | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 60f2f7f..09c30ec 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,3 +4,8 @@ Thank you for contributing to winapps! Before you can contribute, we ask some th - Please follow our Code of Conduct, the Contributor Covenant. You can find a copy in this repository or under https://www.contributor-covenant.org/ - All Contributors have to sign [a CLA](https://gist.github.com/oskardotglobal/35f0a72eb45fcc7087e535561383dbc5) for legal reasons. When opening a PR, @cla-assitant will prompt you and guide you through the process. However, if you contribute on behalf of a legal entity, we ask of you to sign [a different CLA](https://gist.github.com/oskardotglobal/75a8cc056e56a439fa6a1551129ae47f). In that case, please contact us. +- Please follow code conventions enforced by `pre-commit`. To keep down CI usage, please run it locally before committing too. + See for installation, then run `pre-commit install` inside the `winapps` repository you cloned. + +All source code files shall have a valid SPDX-Identifier. For more information, see . +This identifier will be generated by a pre-commit hook most of the time. diff --git a/LICENSE.md b/LICENSE.md index cdb1a13..5a2b59b 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -7,7 +7,6 @@ We have tried contacting Fmstrat about this, but they abandoned the project and However, almost all parts of the codebase have been rewritten and all new contributions require a Contributor License Agreement ([for individuals](https://gist.github.com/oskardotglobal/35f0a72eb45fcc7087e535561383dbc5), [for legal entities](https://gist.github.com/oskardotglobal/75a8cc056e56a439fa6a1551129ae47f)) to be signed. Therefore, the below license is applied to all new contributions made to the project, releasing it into the public domain. -All source code files shall have a valid SPDX-Identifier. For more information, see . Refer to a specific file for it's respective license. ## The Unlicense From 34e76f749b42f89ce704612578d80c9fc27c5c2d Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Wed, 4 Sep 2024 16:56:11 +0200 Subject: [PATCH 25/30] fix: hook crashes in ci --- .pre-commit-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 591662f..6dba837 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,6 @@ ci: autoupdate_branch: "rewrite" + skip: [license-tools] repos: - repo: https://github.com/Lucas-C/pre-commit-hooks From a7c8d4acfe4bc0cecd4dcd82ced5f9dad1066c6d Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Wed, 4 Sep 2024 17:00:15 +0200 Subject: [PATCH 26/30] feat: run lictool seperately in CI --- .github/workflows/lictool.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/lictool.yaml diff --git a/.github/workflows/lictool.yaml b/.github/workflows/lictool.yaml new file mode 100644 index 0000000..844d898 --- /dev/null +++ b/.github/workflows/lictool.yaml @@ -0,0 +1,20 @@ +on: + pull_request: + push: + branches: [main] + +jobs: + lictool: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - uses: actions/setup-python@v4 + with: + python-version: 3.x + + - uses: pre-commit/action@v3.0.1 + extra_args: license-tools + + - uses: pre-commit-ci/lite-action@v1.0.2 + if: always() From c0db3e4d3bcf84e1d6575900fcabb3926a1f593a Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Wed, 4 Sep 2024 21:29:49 +0200 Subject: [PATCH 27/30] Update lictool.yaml --- .github/workflows/lictool.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lictool.yaml b/.github/workflows/lictool.yaml index 844d898..6f09545 100644 --- a/.github/workflows/lictool.yaml +++ b/.github/workflows/lictool.yaml @@ -14,7 +14,8 @@ jobs: python-version: 3.x - uses: pre-commit/action@v3.0.1 - extra_args: license-tools + with: + extra_args: license-tools - uses: pre-commit-ci/lite-action@v1.0.2 if: always() From 2dd0980cc92cdf56607ce4d96bb260a97b5c1b78 Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Thu, 5 Sep 2024 17:31:21 +0200 Subject: [PATCH 28/30] Revert "Merge pull request #15 from winapps-org/add-contribution-guidelines" This reverts commit d2601efeab779b33df97c40945e958fecfcecb73, reversing changes made to f01427a236ea3b2662c94ea9ba959e00b50f600e. --- .github/workflows/lictool.yaml | 21 ------ .license-tools-config.json | 67 ----------------- .pre-commit-config.yaml | 6 -- CODE_OF_CONDUCT.md | 133 --------------------------------- CONTRIBUTING.md | 11 --- LICENSE.md | 37 --------- apps/access-o365-x86/info | 5 -- apps/access-o365/info | 5 -- apps/access-x86/info | 5 -- apps/access/info | 5 -- apps/acrobat-x-pro/info | 5 -- apps/adobe-cc/info | 5 -- apps/aftereffects-cc/info | 5 -- apps/audition-cc/info | 5 -- apps/bridge-cc/info | 5 -- apps/bridge-cs6-x86/info | 5 -- apps/bridge-cs6/info | 5 -- apps/cmd/info | 5 -- apps/excel-o365-x86/info | 5 -- apps/excel-o365/info | 5 -- apps/excel-x86/info | 5 -- apps/excel/info | 5 -- apps/explorer/info | 5 -- apps/iexplorer/info | 5 -- apps/illustrator-cc/info | 5 -- apps/indesign-cc/info | 5 -- apps/lightroom-cc/info | 5 -- apps/onenote-o365-x86/info | 5 -- apps/onenote-o365/info | 5 -- apps/onenote-x86/info | 5 -- apps/onenote/info | 5 -- apps/outlook-o365-x86/info | 5 -- apps/outlook-o365/info | 5 -- apps/outlook-x86/info | 5 -- apps/outlook/info | 5 -- apps/photoshop-cc/info | 5 -- apps/photoshop-cs6-x86/info | 5 -- apps/photoshop-cs6/info | 5 -- apps/powerpoint-o365-x86/info | 5 -- apps/powerpoint-o365/info | 5 -- apps/powerpoint-x86/info | 5 -- apps/powerpoint/info | 5 -- apps/powershell/info | 5 -- apps/project-x86/info | 5 -- apps/project/info | 5 -- apps/publisher-o365-x86/info | 5 -- apps/publisher-o365/info | 5 -- apps/publisher-x86/info | 5 -- apps/publisher/info | 5 -- apps/visio-x86/info | 5 -- apps/visio/info | 5 -- apps/visual-studio-comm/info | 5 -- apps/visual-studio-ent/info | 5 -- apps/visual-studio-pro/info | 5 -- apps/word-o365-x86/info | 5 -- apps/word-o365/info | 5 -- apps/word-x86/info | 5 -- apps/word/info | 5 -- bin/winapps | 4 - compose.yaml | 5 -- install/ExtractPrograms.ps1 | 5 -- install/inquirer.sh | 4 - installer.sh | 5 -- oem/RDPApps.reg | 5 -- oem/install.bat | 4 - 65 files changed, 567 deletions(-) delete mode 100644 .github/workflows/lictool.yaml delete mode 100644 .license-tools-config.json delete mode 100644 CODE_OF_CONDUCT.md delete mode 100644 CONTRIBUTING.md delete mode 100644 LICENSE.md diff --git a/.github/workflows/lictool.yaml b/.github/workflows/lictool.yaml deleted file mode 100644 index 6f09545..0000000 --- a/.github/workflows/lictool.yaml +++ /dev/null @@ -1,21 +0,0 @@ -on: - pull_request: - push: - branches: [main] - -jobs: - lictool: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - uses: actions/setup-python@v4 - with: - python-version: 3.x - - - uses: pre-commit/action@v3.0.1 - with: - extra_args: license-tools - - - uses: pre-commit-ci/lite-action@v1.0.2 - if: always() diff --git a/.license-tools-config.json b/.license-tools-config.json deleted file mode 100644 index 6c1d539..0000000 --- a/.license-tools-config.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "author": { - "from_git": false, - "name": "winapps-org", - "latest_year_only": true - }, - "title": false, - "style_override_for_suffix": { - ".yaml": "POUND_STYLE", - ".ps1": "POUND_STYLE", - ".bat": "BATCH_STYLE", - "": "POUND_STYLE" - }, - "exclude": [ - "^\\.[^/]+", - "/\\.[^/]+", - "^(.+)\\.(md|svg|png|reg|gif)", - "^fonts(/.*)?", - "apps/access/info", - "apps/acrobat-x-pro/info", - "apps/adobe-cc/info", - "apps/aftereffects-cc/info", - "apps/audition-cc/info", - "apps/bridge-cc/info", - "apps/bridge-cs6-x86/info", - "apps/bridge-cs6/info", - "apps/cmd/info", - "apps/excel-o365-x86/info", - "apps/excel-o365/info", - "apps/excel-x86/info", - "apps/excel/info", - "apps/explorer/info", - "apps/iexplorer/info", - "apps/illustrator-cc/info", - "apps/indesign-cc/info", - "apps/lightroom-cc/info", - "apps/onenote-o365-x86/info", - "apps/onenote-x86/info", - "apps/onenote/info", - "apps/outlook-o365-x86/info", - "apps/outlook-x86/info", - "apps/outlook/info", - "apps/photoshop-cc/info", - "apps/photoshop-cs6-x86/info", - "apps/photoshop-cs6/info", - "apps/powerpoint-o365-x86/info", - "apps/powerpoint-o365/info", - "apps/powerpoint-x86/info", - "apps/powerpoint/info", - "apps/powershell/info", - "apps/project-x86/info", - "apps/project/info", - "apps/publisher-o365-x86/info", - "apps/publisher-x86/info", - "apps/publisher/info", - "apps/visio-x86/info", - "apps/visio/info", - "apps/word-o365-x86/info", - "apps/word-o365/info", - "apps/word-x86/info", - "apps/word/info" - ], - "license": false, - "force_author": false, - "force_license": false, - "custom_license": "SPDX-License-Identifier: Unlicense" -} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6dba837..b5f2edb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,5 @@ ci: autoupdate_branch: "rewrite" - skip: [license-tools] repos: - repo: https://github.com/Lucas-C/pre-commit-hooks @@ -49,8 +48,3 @@ repos: rev: v0.10.0.1 hooks: - id: shellcheck - - - repo: https://github.com/emzeat/mz-lictools - rev: v2.7.0 - hooks: - - id: license-tools diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md deleted file mode 100644 index 45d257b..0000000 --- a/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,133 +0,0 @@ - -# Contributor Covenant Code of Conduct - -## Our Pledge - -We as members, contributors, and leaders pledge to make participation in our -community a harassment-free experience for everyone, regardless of age, body -size, visible or invisible disability, ethnicity, sex characteristics, gender -identity and expression, level of experience, education, socio-economic status, -nationality, personal appearance, race, caste, color, religion, or sexual -identity and orientation. - -We pledge to act and interact in ways that contribute to an open, welcoming, -diverse, inclusive, and healthy community. - -## Our Standards - -Examples of behavior that contributes to a positive environment for our -community include: - -* Demonstrating empathy and kindness toward other people -* Being respectful of differing opinions, viewpoints, and experiences -* Giving and gracefully accepting constructive feedback -* Accepting responsibility and apologizing to those affected by our mistakes, - and learning from the experience -* Focusing on what is best not just for us as individuals, but for the overall - community - -Examples of unacceptable behavior include: - -* The use of sexualized language or imagery, and sexual attention or advances of - any kind -* Trolling, insulting or derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or email address, - without their explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - -## Enforcement Responsibilities - -Community leaders are responsible for clarifying and enforcing our standards of -acceptable behavior and will take appropriate and fair corrective action in -response to any behavior that they deem inappropriate, threatening, offensive, -or harmful. - -Community leaders have the right and responsibility to remove, edit, or reject -comments, commits, code, wiki edits, issues, and other contributions that are -not aligned to this Code of Conduct, and will communicate reasons for moderation -decisions when appropriate. - -## Scope - -This Code of Conduct applies within all community spaces, and also applies when -an individual is officially representing the community in public spaces. -Examples of representing our community include using an official e-mail address, -posting via an official social media account, or acting as an appointed -representative at an online or offline event. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported to the community leaders responsible for enforcement at -[INSERT CONTACT METHOD]. -All complaints will be reviewed and investigated promptly and fairly. - -All community leaders are obligated to respect the privacy and security of the -reporter of any incident. - -## Enforcement Guidelines - -Community leaders will follow these Community Impact Guidelines in determining -the consequences for any action they deem in violation of this Code of Conduct: - -### 1. Correction - -**Community Impact**: Use of inappropriate language or other behavior deemed -unprofessional or unwelcome in the community. - -**Consequence**: A private, written warning from community leaders, providing -clarity around the nature of the violation and an explanation of why the -behavior was inappropriate. A public apology may be requested. - -### 2. Warning - -**Community Impact**: A violation through a single incident or series of -actions. - -**Consequence**: A warning with consequences for continued behavior. No -interaction with the people involved, including unsolicited interaction with -those enforcing the Code of Conduct, for a specified period of time. This -includes avoiding interactions in community spaces as well as external channels -like social media. Violating these terms may lead to a temporary or permanent -ban. - -### 3. Temporary Ban - -**Community Impact**: A serious violation of community standards, including -sustained inappropriate behavior. - -**Consequence**: A temporary ban from any sort of interaction or public -communication with the community for a specified period of time. No public or -private interaction with the people involved, including unsolicited interaction -with those enforcing the Code of Conduct, is allowed during this period. -Violating these terms may lead to a permanent ban. - -### 4. Permanent Ban - -**Community Impact**: Demonstrating a pattern of violation of community -standards, including sustained inappropriate behavior, harassment of an -individual, or aggression toward or disparagement of classes of individuals. - -**Consequence**: A permanent ban from any sort of public interaction within the -community. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], -version 2.1, available at -[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1]. - -Community Impact Guidelines were inspired by -[Mozilla's code of conduct enforcement ladder][Mozilla CoC]. - -For answers to common questions about this code of conduct, see the FAQ at -[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at -[https://www.contributor-covenant.org/translations][translations]. - -[homepage]: https://www.contributor-covenant.org -[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html -[Mozilla CoC]: https://github.com/mozilla/diversity -[FAQ]: https://www.contributor-covenant.org/faq -[translations]: https://www.contributor-covenant.org/translations diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 09c30ec..0000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,11 +0,0 @@ -# Contribution Guidelines - -Thank you for contributing to winapps! Before you can contribute, we ask some things of you: - -- Please follow our Code of Conduct, the Contributor Covenant. You can find a copy in this repository or under https://www.contributor-covenant.org/ -- All Contributors have to sign [a CLA](https://gist.github.com/oskardotglobal/35f0a72eb45fcc7087e535561383dbc5) for legal reasons. When opening a PR, @cla-assitant will prompt you and guide you through the process. However, if you contribute on behalf of a legal entity, we ask of you to sign [a different CLA](https://gist.github.com/oskardotglobal/75a8cc056e56a439fa6a1551129ae47f). In that case, please contact us. -- Please follow code conventions enforced by `pre-commit`. To keep down CI usage, please run it locally before committing too. - See for installation, then run `pre-commit install` inside the `winapps` repository you cloned. - -All source code files shall have a valid SPDX-Identifier. For more information, see . -This identifier will be generated by a pre-commit hook most of the time. diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 5a2b59b..0000000 --- a/LICENSE.md +++ /dev/null @@ -1,37 +0,0 @@ -This project is licensed under a dual license. - -The original project by Fmstrat is not free software. -Due to lack of a license, it is All Rights Reserved by the original author. - -We have tried contacting Fmstrat about this, but they abandoned the project and did not reply nor apply an open-source license to the project. -However, almost all parts of the codebase have been rewritten and all new contributions require a Contributor License Agreement ([for individuals](https://gist.github.com/oskardotglobal/35f0a72eb45fcc7087e535561383dbc5), [for legal entities](https://gist.github.com/oskardotglobal/75a8cc056e56a439fa6a1551129ae47f)) to be signed. -Therefore, the below license is applied to all new contributions made to the project, releasing it into the public domain. - -Refer to a specific file for it's respective license. - -## The Unlicense - -This is free and unencumbered software released into the public domain. - -Anyone is free to copy, modify, publish, use, compile, sell, or -distribute this software, either in source code form or as a compiled -binary, for any purpose, commercial or non-commercial, and by any -means. - -In jurisdictions that recognize copyright laws, the author or authors -of this software dedicate any and all copyright interest in the -software to the public domain. We make this dedication for the benefit -of the public at large and to the detriment of our heirs and -successors. We intend this dedication to be an overt act of -relinquishment in perpetuity of all present and future rights to this -software under copyright law. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -For more information, please refer to diff --git a/apps/access-o365-x86/info b/apps/access-o365-x86/info index 13de9d5..3c6739f 100644 --- a/apps/access-o365-x86/info +++ b/apps/access-o365-x86/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 winapps-org -# All rights reserved. -# -# SPDX-License-Identifier: Unlicense - # GNOME shortcut name NAME="Access" diff --git a/apps/access-o365/info b/apps/access-o365/info index be40284..cab586f 100644 --- a/apps/access-o365/info +++ b/apps/access-o365/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 winapps-org -# All rights reserved. -# -# SPDX-License-Identifier: Unlicense - # GNOME shortcut name NAME="Access" diff --git a/apps/access-x86/info b/apps/access-x86/info index 9bf0bf7..d37673c 100644 --- a/apps/access-x86/info +++ b/apps/access-x86/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 winapps-org -# All rights reserved. -# -# SPDX-License-Identifier: Unlicense - # GNOME shortcut name NAME="Access" diff --git a/apps/access/info b/apps/access/info index 49cc306..6a1bea4 100644 --- a/apps/access/info +++ b/apps/access/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Access" diff --git a/apps/acrobat-x-pro/info b/apps/acrobat-x-pro/info index d6c0511..c3e9b58 100644 --- a/apps/acrobat-x-pro/info +++ b/apps/acrobat-x-pro/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Acrobat X Pro" diff --git a/apps/adobe-cc/info b/apps/adobe-cc/info index 492077e..42a62ba 100644 --- a/apps/adobe-cc/info +++ b/apps/adobe-cc/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Creative Cloud" diff --git a/apps/aftereffects-cc/info b/apps/aftereffects-cc/info index 3415312..7181324 100644 --- a/apps/aftereffects-cc/info +++ b/apps/aftereffects-cc/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="After Effects CC" diff --git a/apps/audition-cc/info b/apps/audition-cc/info index b74da97..b3bdde4 100644 --- a/apps/audition-cc/info +++ b/apps/audition-cc/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Audition CC" diff --git a/apps/bridge-cc/info b/apps/bridge-cc/info index bdab33f..b4a8f09 100644 --- a/apps/bridge-cc/info +++ b/apps/bridge-cc/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Bridge CS6" diff --git a/apps/bridge-cs6-x86/info b/apps/bridge-cs6-x86/info index d95e94f..1d8cf59 100644 --- a/apps/bridge-cs6-x86/info +++ b/apps/bridge-cs6-x86/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Bridge CS6" diff --git a/apps/bridge-cs6/info b/apps/bridge-cs6/info index 8c93499..3fa52e8 100644 --- a/apps/bridge-cs6/info +++ b/apps/bridge-cs6/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Bridge CS6" diff --git a/apps/cmd/info b/apps/cmd/info index b1dee75..08e2e87 100644 --- a/apps/cmd/info +++ b/apps/cmd/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Cmd" diff --git a/apps/excel-o365-x86/info b/apps/excel-o365-x86/info index 41d26dd..94b8372 100644 --- a/apps/excel-o365-x86/info +++ b/apps/excel-o365-x86/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Excel" diff --git a/apps/excel-o365/info b/apps/excel-o365/info index 87601ef..e0e67e5 100644 --- a/apps/excel-o365/info +++ b/apps/excel-o365/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Excel" diff --git a/apps/excel-x86/info b/apps/excel-x86/info index 47c446b..bfdb56a 100644 --- a/apps/excel-x86/info +++ b/apps/excel-x86/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Excel" diff --git a/apps/excel/info b/apps/excel/info index 4c8340a..9ef5cb4 100644 --- a/apps/excel/info +++ b/apps/excel/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Excel" diff --git a/apps/explorer/info b/apps/explorer/info index 3417cda..b644bc7 100644 --- a/apps/explorer/info +++ b/apps/explorer/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Explorer" diff --git a/apps/iexplorer/info b/apps/iexplorer/info index a4c5216..2da385e 100644 --- a/apps/iexplorer/info +++ b/apps/iexplorer/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Internet Explorer" diff --git a/apps/illustrator-cc/info b/apps/illustrator-cc/info index 906ac98..58af241 100644 --- a/apps/illustrator-cc/info +++ b/apps/illustrator-cc/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Illustrator CC" diff --git a/apps/indesign-cc/info b/apps/indesign-cc/info index 1b72ea7..481b2dc 100644 --- a/apps/indesign-cc/info +++ b/apps/indesign-cc/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="InDesign CC" diff --git a/apps/lightroom-cc/info b/apps/lightroom-cc/info index 3b433a2..a2cdb25 100644 --- a/apps/lightroom-cc/info +++ b/apps/lightroom-cc/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Lightroom CC" diff --git a/apps/onenote-o365-x86/info b/apps/onenote-o365-x86/info index 3bb7c2a..335e780 100644 --- a/apps/onenote-o365-x86/info +++ b/apps/onenote-o365-x86/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="OneNote" diff --git a/apps/onenote-o365/info b/apps/onenote-o365/info index de58569..6626816 100644 --- a/apps/onenote-o365/info +++ b/apps/onenote-o365/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 winapps-org -# All rights reserved. -# -# SPDX-License-Identifier: Unlicense - # GNOME shortcut name NAME="OneNote" diff --git a/apps/onenote-x86/info b/apps/onenote-x86/info index babe190..e535123 100644 --- a/apps/onenote-x86/info +++ b/apps/onenote-x86/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="OneNote" diff --git a/apps/onenote/info b/apps/onenote/info index 1cd93d6..908f58e 100644 --- a/apps/onenote/info +++ b/apps/onenote/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="OneNote" diff --git a/apps/outlook-o365-x86/info b/apps/outlook-o365-x86/info index 4bdd93b..9a528f4 100644 --- a/apps/outlook-o365-x86/info +++ b/apps/outlook-o365-x86/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Outlook" diff --git a/apps/outlook-o365/info b/apps/outlook-o365/info index 379dd64..4763b83 100644 --- a/apps/outlook-o365/info +++ b/apps/outlook-o365/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 winapps-org -# All rights reserved. -# -# SPDX-License-Identifier: Unlicense - # GNOME shortcut name NAME="Outlook" diff --git a/apps/outlook-x86/info b/apps/outlook-x86/info index 6daead3..4874db3 100644 --- a/apps/outlook-x86/info +++ b/apps/outlook-x86/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Outlook" diff --git a/apps/outlook/info b/apps/outlook/info index a11a448..43453c6 100644 --- a/apps/outlook/info +++ b/apps/outlook/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Outlook" diff --git a/apps/photoshop-cc/info b/apps/photoshop-cc/info index 121b374..a7413d6 100644 --- a/apps/photoshop-cc/info +++ b/apps/photoshop-cc/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Photoshop CC" diff --git a/apps/photoshop-cs6-x86/info b/apps/photoshop-cs6-x86/info index 5e497a6..16d8911 100644 --- a/apps/photoshop-cs6-x86/info +++ b/apps/photoshop-cs6-x86/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Photoshop CS6" diff --git a/apps/photoshop-cs6/info b/apps/photoshop-cs6/info index d17feb1..24cb454 100644 --- a/apps/photoshop-cs6/info +++ b/apps/photoshop-cs6/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Photoshop CS6" diff --git a/apps/powerpoint-o365-x86/info b/apps/powerpoint-o365-x86/info index da4de9c..755acc6 100644 --- a/apps/powerpoint-o365-x86/info +++ b/apps/powerpoint-o365-x86/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="PowerPoint" diff --git a/apps/powerpoint-o365/info b/apps/powerpoint-o365/info index 1520df7..a0d25d2 100644 --- a/apps/powerpoint-o365/info +++ b/apps/powerpoint-o365/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="PowerPoint" diff --git a/apps/powerpoint-x86/info b/apps/powerpoint-x86/info index e69c572..21ba721 100644 --- a/apps/powerpoint-x86/info +++ b/apps/powerpoint-x86/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="PowerPoint" diff --git a/apps/powerpoint/info b/apps/powerpoint/info index 9ae939c..6910809 100644 --- a/apps/powerpoint/info +++ b/apps/powerpoint/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="PowerPoint" diff --git a/apps/powershell/info b/apps/powershell/info index 6d14321..4eca7c5 100644 --- a/apps/powershell/info +++ b/apps/powershell/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Powershell" diff --git a/apps/project-x86/info b/apps/project-x86/info index 4d0b099..ad1614e 100644 --- a/apps/project-x86/info +++ b/apps/project-x86/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Project" diff --git a/apps/project/info b/apps/project/info index f9596c7..d5d904b 100644 --- a/apps/project/info +++ b/apps/project/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Project" diff --git a/apps/publisher-o365-x86/info b/apps/publisher-o365-x86/info index 0b5f62b..3f53e4d 100644 --- a/apps/publisher-o365-x86/info +++ b/apps/publisher-o365-x86/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Publisher" diff --git a/apps/publisher-o365/info b/apps/publisher-o365/info index 728e66a..a0466f0 100644 --- a/apps/publisher-o365/info +++ b/apps/publisher-o365/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 winapps-org -# All rights reserved. -# -# SPDX-License-Identifier: Unlicense - # GNOME shortcut name NAME="Publisher" diff --git a/apps/publisher-x86/info b/apps/publisher-x86/info index cd57950..871509f 100644 --- a/apps/publisher-x86/info +++ b/apps/publisher-x86/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Publisher" diff --git a/apps/publisher/info b/apps/publisher/info index f754757..b0f305e 100644 --- a/apps/publisher/info +++ b/apps/publisher/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Publisher" diff --git a/apps/visio-x86/info b/apps/visio-x86/info index 977fb57..dc8a193 100644 --- a/apps/visio-x86/info +++ b/apps/visio-x86/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Visio" diff --git a/apps/visio/info b/apps/visio/info index 2e1efd0..a7ad0be 100644 --- a/apps/visio/info +++ b/apps/visio/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Visio" diff --git a/apps/visual-studio-comm/info b/apps/visual-studio-comm/info index 02504d6..c99a038 100644 --- a/apps/visual-studio-comm/info +++ b/apps/visual-studio-comm/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 winapps-org -# All rights reserved. -# -# SPDX-License-Identifier: Unlicense - # GNOME shortcut name NAME="Visual Studio Community" diff --git a/apps/visual-studio-ent/info b/apps/visual-studio-ent/info index ad8f769..81cc124 100644 --- a/apps/visual-studio-ent/info +++ b/apps/visual-studio-ent/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 winapps-org -# All rights reserved. -# -# SPDX-License-Identifier: Unlicense - # GNOME shortcut name NAME="Visual Studio Enterprise" diff --git a/apps/visual-studio-pro/info b/apps/visual-studio-pro/info index ac731e7..0c08861 100644 --- a/apps/visual-studio-pro/info +++ b/apps/visual-studio-pro/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 winapps-org -# All rights reserved. -# -# SPDX-License-Identifier: Unlicense - # GNOME shortcut name NAME="Visual Studio Professional" diff --git a/apps/word-o365-x86/info b/apps/word-o365-x86/info index d2146b2..b2d853d 100644 --- a/apps/word-o365-x86/info +++ b/apps/word-o365-x86/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Word" diff --git a/apps/word-o365/info b/apps/word-o365/info index a60311b..0632b79 100644 --- a/apps/word-o365/info +++ b/apps/word-o365/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Word" diff --git a/apps/word-x86/info b/apps/word-x86/info index 66c8cc0..b35c54e 100644 --- a/apps/word-x86/info +++ b/apps/word-x86/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Word" diff --git a/apps/word/info b/apps/word/info index 46c74c6..a1dfd71 100644 --- a/apps/word/info +++ b/apps/word/info @@ -1,8 +1,3 @@ -# Copyright (c) 2024 Fmstrat -# All rights reserved. -# -# SPDX-License-Identifier: Proprietary - # GNOME shortcut name NAME="Word" diff --git a/bin/winapps b/bin/winapps index 0d39651..1563955 100755 --- a/bin/winapps +++ b/bin/winapps @@ -1,8 +1,4 @@ #!/usr/bin/env bash -# Copyright (c) 2024 winapps-org -# All rights reserved. -# -# SPDX-License-Identifier: Unlicense ### GLOBAL CONSTANTS ### # ERROR CODES diff --git a/compose.yaml b/compose.yaml index 4992b51..3e77cfb 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,8 +1,3 @@ -# Copyright (c) 2024 winapps-org -# All rights reserved. -# -# SPDX-License-Identifier: Unlicense - # For documentation, FAQ, additional configuration options and technical help, visit: https://github.com/dockur/windows name: "winapps" # Docker Compose Project Name. diff --git a/install/ExtractPrograms.ps1 b/install/ExtractPrograms.ps1 index 87b0527..5662f16 100644 --- a/install/ExtractPrograms.ps1 +++ b/install/ExtractPrograms.ps1 @@ -1,8 +1,3 @@ -# Copyright (c) 2024 winapps-org -# All rights reserved. -# -# SPDX-License-Identifier: Unlicense - ### FUNCTIONS ### # Name: 'GetApplicationIcon' # Role: Extract the icon from a given executable file as a base-64 string. diff --git a/install/inquirer.sh b/install/inquirer.sh index 2640e60..881079a 100755 --- a/install/inquirer.sh +++ b/install/inquirer.sh @@ -1,8 +1,4 @@ #!/usr/bin/env bash -# Copyright (c) 2024 winapps-org -# All rights reserved. -# -# SPDX-License-Identifier: Unlicense ### GLOBAL CONSTANTS ### declare -r ANSI_LIGHT_BLUE="\033[1;94m" # Light blue text. diff --git a/installer.sh b/installer.sh index 66d7ecd..60a9b39 100755 --- a/installer.sh +++ b/installer.sh @@ -1,9 +1,4 @@ #!/usr/bin/env bash -# Copyright (c) 2024 winapps-org -# All rights reserved. -# -# SPDX-License-Identifier: Unlicense - # shellcheck disable=SC2034 # Silence warnings regarding unused variables globally. ### GLOBAL CONSTANTS ### diff --git a/oem/RDPApps.reg b/oem/RDPApps.reg index fe249b8..acb5aac 100644 --- a/oem/RDPApps.reg +++ b/oem/RDPApps.reg @@ -1,8 +1,3 @@ -; Copyright (c) 2024 Fmstrat -; Copyright (c) 2024 winapps-org -; All rights reserved. -; -; SPDX-License-Identifier: Proprietary Windows Registry Editor Version 5.00 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList] diff --git a/oem/install.bat b/oem/install.bat index 8fbe8d6..182423c 100644 --- a/oem/install.bat +++ b/oem/install.bat @@ -1,7 +1,3 @@ @echo off -REM Copyright (c) 2024 winapps-org -REM All rights reserved. -REM -REM SPDX-License-Identifier: Unlicense REG IMPORT C:\OEM\RDPApps.reg From 95daa5d837d1d532fcfa11ba8c04a50d5e82bf86 Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Sat, 7 Sep 2024 13:23:37 +0200 Subject: [PATCH 29/30] fix: properly specify curl output --- setup.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/setup.sh b/setup.sh index a7c1361..7b59eaa 100755 --- a/setup.sh +++ b/setup.sh @@ -185,15 +185,17 @@ function waGetSourceCode() { # Name: 'waGetInquirer' # Role: Loads the inquirer script, even if the source isn't cloned yet function waGetInquirer() { - if [ ! -d "$SYS_SOURCE_PATH" ] && [ ! -d "$USER_SOURCE_PATH" ]; then - INQUIRER_PATH="/tmp/waInquirer.sh" - rm -f "$INQUIRER_PATH" + local INQUIRER=$INQUIRER_PATH - curl "https://raw.githubusercontent.com/winapps-org/winapps/main/install/inquirer.sh" -O "$INQUIRER_PATH" + if [ ! -d "$SYS_SOURCE_PATH" ] && [ ! -d "$USER_SOURCE_PATH" ]; then + INQUIRER="/tmp/waInquirer.sh" + rm -f "$INQUIRER" + + curl -o "$INQUIRER" "https://raw.githubusercontent.com/winapps-org/winapps/main/install/inquirer.sh" fi # shellcheck source=/dev/null # Exclude this file from being checked by ShellCheck. - source "$INQUIRER_PATH" + source "$INQUIRER" } # Name: 'waCheckInput' From 4e3d5bd4581250a49974a19b37f55fc76165051a Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Sat, 7 Sep 2024 13:28:43 +0200 Subject: [PATCH 30/30] fix: catch error if exe has no version info --- install/ExtractPrograms.ps1 | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/install/ExtractPrograms.ps1 b/install/ExtractPrograms.ps1 index b1587ea..3357f15 100644 --- a/install/ExtractPrograms.ps1 +++ b/install/ExtractPrograms.ps1 @@ -103,11 +103,9 @@ function GetApplicationName { [string]$exePath ) - if ((Get-Item $exePath).VersionInfo.FileDescription) { - # Remove leading/trailing whitespace and replace multiple spaces with a single space. + try { $productName = (Get-Item $exePath).VersionInfo.FileDescription.Trim() -replace '\s+', ' ' - } else { - # Get the executable file name without the file extension. + } catch { $productName = [System.IO.Path]::GetFileNameWithoutExtension($exePath) } @@ -125,10 +123,7 @@ function GetUWPApplicationName { # Query the application executable for the application name. if (Test-Path $exePath) { - if ((Get-Item $exePath).VersionInfo.FileDescription) { - # Remove leading/trailing whitespace and replace multiple spaces with a single space. - $productName = (Get-Item $exePath).VersionInfo.FileDescription.Trim() -replace '\s+', ' ' - } + $productName = GetApplicationName -exePath $exePath } # Use the 'DisplayName' (if available) if the previous method failed.