diff --git a/AUTHORS b/.github/AUTHORS similarity index 100% rename from AUTHORS rename to .github/AUTHORS diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..3778ea6 --- /dev/null +++ b/.github/CODE_OF_CONDUCT.md @@ -0,0 +1,128 @@ +# 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, 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 +https://github.com/vinceliuice/WhiteSur-gtk-theme/issues. +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.0, available at +https://www.contributor-covenant.org/version/2/0/code_of_conduct.html. + +Community Impact Guidelines were inspired by [Mozilla's code of conduct +enforcement ladder](https://github.com/mozilla/diversity). + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see the FAQ at +https://www.contributor-covenant.org/faq. Translations are available at +https://www.contributor-covenant.org/translations. diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md similarity index 87% rename from CONTRIBUTING.md rename to .github/CONTRIBUTING.md index 5b6b4f5..ef54c61 100644 --- a/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -30,6 +30,10 @@ You can read about SASS at http://sass-lang.com/documentation/. Once you make yo _common.scss file, you can either run the ./parse-sass.sh script or keep SASS watching for changes as you edit. +## Known bugs + +### Theme glitches on NVIDIA driver +See upstream [bug](https://web.archive.org/web/20210609140801/https://forums.developer.nvidia.com/t/issues-with-icons-gtk-theme-and-other-graphical-components-prior-to-installation-of-nvidia-drivers/38618). # WhiteSur Firefox theme A MacOS Big Sur theme for Firefox 70+ @@ -40,7 +44,10 @@ A MacOS Big Sur theme for Firefox 70+ See upstream [bug](https://bugzilla.mozilla.org/show_bug.cgi?id=1408360). ### Icons color broken -Icons might appear black where they should be white on some systems. I have no idea why, but you can adjust them in the `theme/colors/light.css` or `theme/colors/dark.css` files, look for `--gnome-icons-hack-filter` var and play with css filters. +Icons might appear black where they should be white on some systems. I have no +idea why, but you can adjust them in the `theme/colors/light.css` or +`theme/colors/dark.css` files, look for `--gnome-icons-hack-filter` var and +play with css filters. ## Development @@ -71,6 +78,8 @@ any specific license on your code. Developed by **Rafael Mardojai** and [contributors](https://github.com/rafaelmardojai/firefox-gnome-theme/graphs/contributors). Based on **[Sai Kurogetsu](https://github.com/kurogetsusai/firefox-gnome-theme)** original work. # WhiteSur GDM and GNOME Shell theme + ## Known bugs + ### Can't change GDM background on OpenSUSE Tumbleweed See upstream [bug](https://github.com/juhaku/loginized#known-limitations-and-issues). diff --git a/.github/ISSUE_TEMPLATE/glitch.md b/.github/ISSUE_TEMPLATE/glitch.md new file mode 100644 index 0000000..a786e67 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/glitch.md @@ -0,0 +1,10 @@ +--- +name: Glitch +about: Report unexpected behavior or something doesn't work +title: '' +labels: 'bug' +assignees: 'vinceliuice' + +--- + +Please provide your system info (distro version, etc.) and of course, the screenshot diff --git a/.github/ISSUE_TEMPLATE/idea.md b/.github/ISSUE_TEMPLATE/idea.md new file mode 100644 index 0000000..1c7adfa --- /dev/null +++ b/.github/ISSUE_TEMPLATE/idea.md @@ -0,0 +1,10 @@ +--- +name: Idea +about: Share your idea, request, and question +title: '' +labels: 'question' +assignees: 'vinceliuice' + +--- + +What's your idea, or question? diff --git a/.github/ISSUE_TEMPLATE/installation.md b/.github/ISSUE_TEMPLATE/installation.md new file mode 100644 index 0000000..82769a2 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/installation.md @@ -0,0 +1,10 @@ +--- +name: Installation +about: Report installation error info +title: '' +labels: 'bug' +assignees: 'rivanfebrian123' + +--- + +Please copy and paste your error info here diff --git a/.github/SECURITY.md b/.github/SECURITY.md new file mode 100644 index 0000000..c48059e --- /dev/null +++ b/.github/SECURITY.md @@ -0,0 +1,14 @@ +# Security Policy + +## Supported Versions + +| Version | Supported | +| ------------ | ------------------ | +| 2021-05-05 | :white_check_mark: | +| 2021-04-20 | :white_check_mark: | +| < 2021-04-08 | :x: | + +## Reporting a Vulnerability + +Report a security vulnerability to https://github.com/vinceliuice/WhiteSur-gtk-theme/issues +with a blank template diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..8ad4503 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1 @@ +What's the changes? diff --git a/COPYING b/COPYING index 9cecc1d..10a35e6 100644 --- a/COPYING +++ b/COPYING @@ -1,674 +1,19 @@ - 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. - - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} - - 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: - - {project} Copyright (C) {year} {fullname} - 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 -. +Copyright (c) 2021 WhiteSur Developers + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +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 OR COPYRIGHT HOLDERS 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. diff --git a/README.md b/README.md index 35e0cc2..fac385c 100644 --- a/README.md +++ b/README.md @@ -8,20 +8,15 @@ # Installation is easy!
Required dependencies info for nerds -### Gtk2 theme required -- gtk-murrine-engine `Fedora/RedHat` -- gtk2-engines-murrine `Ubuntu/Mint/Debian` -- gtk-engine-murrine `Arch/Manjaro` - -### Install from source required +### "Install from source" deps - sassc - libglib2.0-dev-bin `ubuntu 20.04` - libglib2.0-dev `ubuntu 18.04` `debian 10.03` `linux mint 19` - libxml2-utils `ubuntu 18.04` `debian 10.03` `linux mint 19` - glib2-devel `Fedora` `Redhat` -### Theme tweaks required -- imagemagick `(optional for Gdm theme tweaks)` +### Misc deps +- imagemagick `(optional for GDM theme tweak)` - dialog `(optional for installation in dialog mode)` - optipng `(optional for asset rendering)` - inkscape `(optional for asset rendering)` @@ -29,28 +24,30 @@ Don't worry, WhiteSur installer already provides all of those dependencies.
-
Recommended gnome-shell extensions +
Recommended GNOME Shell extensions -- [floating-dock](https://extensions.gnome.org/extension/3730/floating-dock) `Gnome-shell <= 3.38` -- [dash-to-dock](https://extensions.gnome.org/extension/307/dash-to-dock) `Gnome-shell <= 3.38` -- [dash-to-dock](https://github.com/ewlsh/dash-to-dock/tree/ewlsh/gnome-40) `Gnome-shell >= 40.0` +- [dash-to-dock](https://extensions.gnome.org/extension/307/dash-to-dock) `gnome-shell <= 3.38` +- [dash-to-dock](https://github.com/ewlsh/dash-to-dock/tree/ewlsh/gnome-40) +(GNOME Shell 40 patch) `gnome-shell >= 40.0` +- [floating-dock](https://extensions.gnome.org/extension/3730/floating-dock) +(Dash to Dock alternative) `gnome-shell <= 3.38` - [blur-my-shell](https://extensions.gnome.org/extension/3193/blur-my-shell)
## Quick install -### Use the stable package -You can choose the compressed file [compiled in stable version](stable-release) and unzip it to the theme folder `~/.themes` under the user folder. +### Using a stable package +Choose a [stable package](stable-release) and unzip it to the user theme folder `~/.themes`. -### Compile from source -You can run `./install.sh` to install the default WhiteSur GTK theme pack which includes +### Installing from source +Run `./install.sh` to install the default WhiteSur GTK theme pack which includes GNOME Shell (Pantheon), Cinnamon, XFWM (XFCE), Metacity, and Plank themes. ## There's so many customizations you can do! Usage: `./install.sh [OPTIONS...]` -
Install OPTIONS +
Options ```bash -d, --dest [DIR] # Set destination directory. Default is '/home/vince/.themes' @@ -147,7 +144,7 @@ control button variant, etc. # Let's tweak! Usage: `./tweaks.sh [OPTIONS...]` -
TWEAKS OPTIONS +
Options ```bash -f, --firefox @@ -238,7 +235,7 @@ Example: `./tweaks.sh -d -c dark`

#### Install GDM theme -Parameter: `--gdm` `-g` (requires to be ran as root) +Parameter: `--gdm` `-g` (requires to be run as root) Example: `sudo ./tweaks.sh -g` @@ -253,8 +250,8 @@ sudo ./tweaks.sh -g -b default # use the default background sudo ./tweaks.sh -g -b blank # make it blank ``` -#### Make the background not darker (normal) -Parameter: `--no_darken` `-N` +#### Don't darken the background +Parameter: `--no-darken` `-N` Example: @@ -329,4 +326,4 @@ Note:

# Technical details and getting involved -Please go read [CONTRIBUTING.md](CONTRIBUTING.md) for more info +Please go read [CONTRIBUTING.md](.github/CONTRIBUTING.md) for more info diff --git a/install.sh b/install.sh index 3d92867..976f4a3 100755 --- a/install.sh +++ b/install.sh @@ -3,10 +3,10 @@ # WARNING: Please make this shell not working-directory dependant, for example # instead of using 'ls blabla', use 'ls "${REPO_DIR}/blabla"' # -# WARNING: Please don't use sudo directly here since it steals our EXIT trap -# # WARNING: Don't use "cd" in this shell, use it in a subshell instead, # for example ( cd blabla && do_blabla ) or $( cd .. && do_blabla ) +# +# SUGGESTION: Please don't put any dependency installation here ############################################################################### # VARIABLES & HELP # @@ -42,6 +42,7 @@ usage() { helpify "--normal, --normalshowapps" "" "Set gnome-shell show apps button style to normal" "Default is bigsur" helpify "--dialog, --interactive" "" "Run this installer interactively, with dialogs" "" helpify "-r, --remove, -u, --uninstall" "" "Remove all installed ${THEME_NAME} themes" "" + helpify "--silent-mode" "" "Meant for developers: ignore any confirm prompt and params become more strict" "" helpify "-h, --help" "" "Show this help" "" } @@ -51,6 +52,8 @@ usage() { #-----------------------------PARSE ARGUMENTS---------------------------------# +echo + while [[ $# -gt 0 ]]; do # Don't show any dialog here. Let this loop checks for errors or shows help # We can only show dialogs when there's no error and no -r parameter @@ -65,8 +68,12 @@ while [[ $# -gt 0 ]]; do # Parameters that don't require value -r|--remove|-u|-uninstall) uninstall='true'; shift ;; + --silent-mode) + full_sudo "${1}"; silent_mode='true'; shift ;; --dialog|--interactive) interactive='true'; shift ;; + -h|--help) + need_help="true"; shift ;; --normal|--normalshowapps) showapps_normal="true"; shift ;; --right|--rightplacement) @@ -75,8 +82,6 @@ while [[ $# -gt 0 ]]; do max_round="true"; shift ;; -HD|--highdefinition) compact="false"; shift ;; - -h|--help) - need_help="true"; shift ;; # Parameters that require value, single use -b|--background) check_param "${1}" "${1}" "${2}" "must" "must" "must" "false" && shift 2 || shift ;; @@ -117,11 +122,9 @@ if [[ "${uninstall}" == 'true' ]]; then remove_themes prompt -s "Done! All '${name}' themes has been removed." else - install_theme_deps; echo - if [[ "${interactive}" == 'true' ]]; then show_panel_opacity_dialog; show_sidebar_size_dialog; show_nautilus_style_dialog - prompt -w "DIALOG: '--size' and '--panel' parameters are ignored if exist."; echo + echo; prompt -w "DIALOG: '--size' and '--panel' parameters are ignored if exist."; echo else show_needed_dialogs fi @@ -143,7 +146,7 @@ else # rm -rf "${THEME_SRC_DIR}/sass/_gtk-base-temp.scss" - if is_my_distro "arch" && has_command xfce4-session; then + if (is_my_distro "arch" || is_my_distro "void") && has_command xfce4-session; then msg="XFCE: you may need to logout after changing your theme to fix your panel opacity." notif_msg="${msg}\n\n${final_msg}" @@ -152,6 +155,8 @@ else notif_msg="${final_msg}" fi - echo; prompt -w "${final_msg}"; echo + echo; prompt -w "${final_msg}" [[ -x /usr/bin/notify-send ]] && notify-send "'${name}' theme has been installed. Enjoy!" "${notif_msg}" -i "dialog-information-symbolic" fi + +echo diff --git a/lib-core.sh b/lib-core.sh index 8b0be7d..6fb9b31 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -3,8 +3,6 @@ # # WARNING: Don't use "cd" in this shell, use it in a subshell instead, # for example ( cd blabla && do_blabla ) or $( cd .. && do_blabla ) -# -# WARNING: Please don't use sudo directly here since it steals our EXIT trap set -Eeo pipefail @@ -20,6 +18,8 @@ WHITESUR_SOURCE=("lib-core.sh") # VARIABLES # ############################################################################### +#--------------System--------------# + export WHITESUR_PID=$$ MY_USERNAME="$(logname 2> /dev/null || echo ${SUDO_USER:-${USER}})" @@ -33,7 +33,7 @@ else GNOME_VERSION="none" fi -# Program options +#----------Program options-------------# SASSC_OPT="-M -t expanded" if [[ "$(uname -s)" =~ "BSD" || "$(uname -s)" == "Darwin" ]]; then @@ -42,7 +42,9 @@ else SED_OPT="-i" fi -# Directories +SUDO_BIN="$(which sudo)" + +#------------Directories--------------# THEME_SRC_DIR="${REPO_DIR}/src" DASH_TO_DOCK_SRC_DIR="${REPO_DIR}/src/other/dash-to-dock" DASH_TO_DOCK_DIR_ROOT="/usr/share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com" @@ -56,13 +58,13 @@ FIREFOX_SNAP_DIR_HOME="/home/${MY_USERNAME}/snap/firefox/common/.mozilla/firefox FIREFOX_SNAP_THEME_DIR="/home/${MY_USERNAME}/snap/firefox/common/.mozilla/firefox/firefox-themes" export WHITESUR_TMP_DIR="/tmp/WhiteSur.lock" -if [[ -w "/" ]]; then +if [[ -w "/root" ]]; then THEME_DIR="/usr/share/themes" else THEME_DIR="$HOME/.themes" fi -# GDM +#--------------GDM----------------# WHITESUR_GS_DIR="/usr/share/gnome-shell/theme/WhiteSur" COMMON_CSS_FILE="/usr/share/gnome-shell/theme/gnome-shell.css" UBUNTU_CSS_FILE="/usr/share/gnome-shell/theme/ubuntu.css" @@ -74,7 +76,7 @@ POP_OS_GR_FILE="/usr/share/gnome-shell/theme/Pop/gnome-shell-theme.gresource" MISC_GR_FILE="/usr/share/gnome-shell/gnome-shell-theme.gresource" GS_GR_XML_FILE="${THEME_SRC_DIR}/main/gnome-shell/gnome-shell-theme.gresource.xml" -# Theme +#-------------Theme---------------# THEME_NAME="WhiteSur" COLOR_VARIANTS=('light' 'dark') OPACITY_VARIANTS=('normal' 'solid') @@ -85,7 +87,7 @@ SIDEBAR_SIZE_VARIANTS=('default' '220' '240' '260' '280') PANEL_OPACITY_VARIANTS=('default' '30' '45' '60' '75') NAUTILUS_STYLE_VARIANTS=('stable' 'normal' 'mojave' 'glassy') -# Customization, default values +#--------Customization, default values----------# dest="${THEME_DIR}" name="${THEME_NAME}" colors=("${COLOR_VARIANTS}") @@ -99,14 +101,15 @@ nautilus_style="${NAUTILUS_STYLE_VARIANTS[0]}" background="default" compact="true" -# Ambigous arguments checking and overriding default values +#--Ambigous arguments checking and overriding default values--# declare -A has_set=([-b]="false" [-s]="false" [-p]="false" [-d]="false" [-n]="false" [-a]="false" [-o]="false" [-c]="false" [-i]="false" [-t]="false" [-N]="false") declare -A need_dialog=([-b]="false" [-s]="false" [-p]="false" [-d]="false" [-n]="false" [-a]="false" [-o]="false" [-c]="false" [-i]="false" [-t]="false" [-N]="false") -# Tweaks +#------------Tweaks---------------# need_help="false" uninstall="false" interactive="false" +silent_mode="false" no_darken="false" no_blur="false" @@ -120,30 +123,38 @@ dash_to_dock="false" max_round="false" showapps_normal="false" -# Misc +#--------------Misc----------------# msg="" final_msg="Run '${0} --help' to explore more customization features!" notif_msg="" process_ids=() -error_snippet="" +# This is important for 'udu' because 'return "${result}"' is considered the +# last command in 'BASH_COMMAND' variable +WHITESUR_COMMAND="" export ANIM_PID="0" has_any_error="false" +swupd_packages="" +# '/' ending is required in 'swupd_url' +swupd_url="https://cdn.download.clearlinux.org/current/x86_64/os/Packages/" +swupd_ver_url="https://cdn.download.clearlinux.org/latest" +swupd_prepared="false" +xbps_prepared="false" -# Colors and animation -c_default="\033[0m" -c_blue="\033[1;34m" -c_magenta="\033[1;35m" -c_cyan="\033[1;36m" -c_green="\033[1;32m" -c_red="\033[1;31m" -c_yellow="\033[1;33m" +#------------Decoration-----------# +export c_default="\033[0m" +export c_blue="\033[1;34m" +export c_magenta="\033[1;35m" +export c_cyan="\033[1;36m" +export c_green="\033[1;32m" +export c_red="\033[1;31m" +export c_yellow="\033[1;33m" anim=( - "${c_blue}•${c_green}•${c_red}•${c_magenta}• " - " ${c_green}•${c_red}•${c_magenta}•${c_blue}• " - " ${c_red}•${c_magenta}•${c_blue}•${c_green}• " - " ${c_magenta}•${c_blue}•${c_green}•${c_red}• " - " ${c_blue}•${c_green}•${c_red}•${c_magenta}• " + "${c_blue}•${c_green}•${c_red}•${c_magenta}• " + " ${c_green}•${c_red}•${c_magenta}•${c_blue}• " + " ${c_red}•${c_magenta}•${c_blue}•${c_green}• " + " ${c_magenta}•${c_blue}•${c_green}•${c_red}• " + " ${c_blue}•${c_green}•${c_red}•${c_magenta}•" ) ############################################################################### @@ -151,6 +162,8 @@ anim=( ############################################################################### start_animation() { + [[ "${silent_mode}" == "true" ]] && return 0 + setterm -cursor off ( @@ -171,6 +184,8 @@ start_animation() { } stop_animation() { + [[ "${silent_mode}" == "true" ]] && return 0 + [[ -e "/proc/${ANIM_PID}" ]] && kill -13 "${ANIM_PID}" setterm -cursor on } @@ -214,37 +229,50 @@ signal_exit() { stop_animation } -operation_aborted() { +signal_abort() { + signal_exit + prompt -e "\n\n Oops! Operation has been aborted...\n\n" + exit 1 +} + +signal_error() { + # TODO: make this more accurate + IFS=$'\n' local sources=($(basename -a "${WHITESUR_SOURCE[@]}" "${BASH_SOURCE[@]}" | sort -u)) - local dist_ids=($(awk -F '=' '/ID/{print $2}' "/etc/os-release")) + local dist_ids=($(awk -F '=' '/ID/{print $2}' "/etc/os-release" | tr -d '"' | sort -Vru)) local repo_ver="" local lines=() + local log="$(awk '{printf "\033[1;31m >>> %s\n", $0}' "${WHITESUR_TMP_DIR}/error_log.txt" || echo "")" - if ! repo_ver="$(cd "${REPO_DIR}"; git log -1 --date=format-local:"%FT%T%z" --format="%ad" 2> /dev/null)"; then + if ! repo_ver="$(cd "${REPO_DIR}"; git log -1 --date=format-local:"%FT%T%z" --format="%ad")"; then if ! repo_ver="$(date -r "${REPO_DIR}" +"%FT%T%z")"; then repo_ver="unknown" fi fi - clear + # Some computer may have a bad performance. We need to avoid the error log + # to be cut. Sleeping for awhile may help + sleep 0.75; clear - prompt -e "\n\n Oops! Operation has been aborted or failed...\n" + prompt -e "\n\n Oops! Operation failed...\n" prompt -e "=========== ERROR LOG ===========" - if ! awk '{printf "\033[1;31m >>> %s\n", $0}' "${WHITESUR_TMP_DIR}/error_log.txt"; then - prompt -e ">>>>>>> No error log found <<<<<<" + if [[ "${log}" ]] ; then + echo -e "${log}" + else + prompt -e "\n>>>>>>> No error log found <<<<<<" fi prompt -e "\n =========== ERROR INFO ==========" prompt -e "FOUND :" for i in "${sources[@]}"; do - lines=($(grep -Fn "${error_snippet:-${BASH_COMMAND}}" "${REPO_DIR}/${i}" | cut -d : -f 1 || echo "")) + lines=($(grep -Fn "${WHITESUR_COMMAND:-${BASH_COMMAND}}" "${REPO_DIR}/${i}" | cut -d : -f 1 || echo "")) prompt -e " >>> ${i}$(IFS=';'; [[ "${lines[*]}" ]] && echo " at ${lines[*]}")" done - prompt -e "SNIPPET:\n >>> ${error_snippet:-${BASH_COMMAND}}" + prompt -e "SNIPPET:\n >>> ${WHITESUR_COMMAND:-${BASH_COMMAND}}" prompt -e "TRACE :" for i in "${FUNCNAME[@]}"; do @@ -253,46 +281,66 @@ operation_aborted() { prompt -e "\n =========== SYSTEM INFO =========" prompt -e "DISTRO : $(IFS=';'; echo "${dist_ids[*]}")" - prompt -e "SUDO : $([[ -w "/" ]] && echo "yes" || echo "no")" + prompt -e "SUDO : $([[ -w "/root" ]] && echo "yes" || echo "no")" prompt -e "GNOME : ${GNOME_VERSION}" prompt -e "REPO : ${repo_ver}\n" - prompt -i "HINT: You can google or report to us the infos above\n" + prompt -i "HINT: You can google or report to us the info above\n" prompt -i "https://github.com/vinceliuice/WhiteSur-gtk-theme/issues\n\n" rm -rf "${WHITESUR_TMP_DIR}"; exit 1 } -rootify() { - trap true SIGINT - prompt -w "Executing '$(echo "${@}" | cut -c -35 )...' as root" - - if ! sudo "${@}"; then - error_snippet="${*}" - operation_aborted - fi - - trap signal_exit SIGINT -} - -userify() { - trap true SIGINT - - if ! sudo -u "${MY_USERNAME}" "${@}"; then - error_snippet="${*}" - operation_aborted - fi - - trap signal_exit SIGINT -} - -trap 'operation_aborted' ERR -trap 'signal_exit' INT EXIT TERM +trap 'signal_exit' EXIT +trap 'signal_error' ERR +trap 'signal_abort' INT TERM TSTP ############################################################################### # USER UTILITIES # ############################################################################### +ask() { + [[ "${silent_mode}" == "true" ]] && return 0 + + echo -ne "${c_magenta}" + read -p " ${2}: " ${1} 2>&1 + echo -ne "${c_default}" +} + +confirm() { + [[ "${silent_mode}" == "true" ]] && return 0 + + while [[ "${!1}" != "y" && "${!1}" != "n" ]]; do + ask ${1} "${2} (y/n)" + done +} + +dialogify() { + if [[ "${silent_mode}" == "true" ]]; then + prompt -w "Oops... silent mode has been activated so we can't show the dialog" + return 0 + fi + + local lists="" + local i=0 + local result="" + local n_result=4 + + for list in "${@:4}"; do + lists+=" ${i} ${list} off "; ((i+=1)) + done + + result="$(dialog --backtitle "${2}" --radiolist "${3}" 0 0 0 ${lists} --output-fd 1 || echo "x")" + clear + + if [[ "${result}" != "x" ]]; then + ((n_result+=result)) + printf -v "${1}" "%s" "${!n_result}" + else + signal_abort + fi +} + helpify_title() { printf "${c_cyan}%s${c_blue}%s ${c_green}%s\n\n" "Usage: " "$0" "[OPTIONS...]" printf "${c_cyan}%s\n" "OPTIONS:" @@ -308,7 +356,7 @@ has_command() { } has_flatpak_app() { - flatpak list --columns=application 2> /dev/null | grep "${1}" &> /dev/null || return 1 + flatpak list --columns=application | grep "${1}" &> /dev/null || return 1 } has_snap_app() { @@ -374,6 +422,12 @@ check_param() { local has_any_ambiguity_error="false" local variant_found="false" + if [[ "${silent_mode}" == "true" ]]; then + must_not_ambigous="must" + must_have_value="must" + value_must_found="must" + fi + if [[ "${has_set["${global_param}"]}" == "true" ]]; then need_dialog["${global_param}"]="true" @@ -457,8 +511,6 @@ check_param() { fi done ;; -a) - [[ "${alts_set}" == "false" ]] && alts=() - if [[ "${value}" == "all" ]]; then for i in {0..2}; do alts+=("${ALT_VARIANTS[i]}") @@ -537,7 +589,7 @@ avoid_variant_duplicates() { themes=($(printf "%s\n" "${themes[@]}" | sort -u)) } -# 'finalize_argument_parsing' is in the 'systems' section +# 'finalize_argument_parsing' is in the 'MISC' section ############################################################################### # FILES # @@ -546,10 +598,10 @@ avoid_variant_duplicates() { restore_file() { if [[ -f "${1}.bak" ]]; then case "${2}" in - rootify) - rootify rm -rf "${1}"; rootify mv "${1}"{".bak",""} ;; - userify) - userify rm -rf "${1}"; userify mv "${1}"{".bak",""} ;; + sudo) + sudo rm -rf "${1}"; sudo mv "${1}"{".bak",""} ;; + udo) + udo rm -rf "${1}"; udo mv "${1}"{".bak",""} ;; *) rm -rf "${1}"; mv "${1}"{".bak",""} ;; esac @@ -559,19 +611,19 @@ restore_file() { backup_file() { if [[ -f "${1}" ]]; then case "${2}" in - rootify) - rootify mv -n "${1}"{"",".bak"} ;; - userify) - userify mv -n "${1}"{"",".bak"} ;; + sudo) + sudo mv -n "${1}"{"",".bak"} ;; + udo) + udo mv -n "${1}"{"",".bak"} ;; *) mv -n "${1}"{"",".bak"} ;; esac fi } -userify_file() { +udoify_file() { if [[ -f "${1}" && "$(ls -ld "${1}" | awk '{print $3}')" != "${MY_USERNAME}" ]]; then - rootify chown "${MY_USERNAME}:" "${1}" + sudo chown "${MY_USERNAME}:" "${1}" fi } @@ -587,24 +639,88 @@ remind_relative_path() { # MISC # ############################################################################### -full_rootify() { - if [[ ! -w "/" ]]; then +sudo() { + local result="0" + + prompt -w "Executing '$(echo "${@}" | cut -c -35 )...' as root" + + if ! ${SUDO_BIN} -n true &> /dev/null; then + echo -e "${c_magenta} Authentication is required:${c_default}" + fi + + if [[ -p /dev/stdin ]]; then + ${SUDO_BIN} "${@}" < /dev/stdin || result="${?}" + else + ${SUDO_BIN} "${@}" || result="${?}" + fi + + [[ "${result}" != "0" ]] && WHITESUR_COMMAND="${*}" + + return "${result}" +} + +udo() { + local result="0" + + # Just in case. We put the prompt here to make it less annoying + if ! ${SUDO_BIN} -u "${MY_USERNAME}" -n true &> /dev/null; then + prompt -w "Executing '$(echo "${@}" | cut -c -35 )...' as user" + echo -e "${c_magenta} Authentication is required:${c_default}" + fi + + if [[ -p /dev/stdin ]]; then + ${SUDO_BIN} -u "${MY_USERNAME}" "${@}" < /dev/stdin || result="${?}" + else + ${SUDO_BIN} -u "${MY_USERNAME}" "${@}" || result="${?}" + fi + + [[ "${result}" != "0" ]] && WHITESUR_COMMAND="${*}" + + return "${result}" +} + +full_sudo() { + if [[ ! -w "/root" ]]; then prompt -e "ERROR: '${1}' needs a root priviledge. Please run this '${0}' as root" has_any_error="true" fi } +get_utc_epoch_time() { + local time="" + local epoch="" + + if exec 3<> "/dev/tcp/iana.org/80"; then + echo -e "GET / HTTP/1.1\nHost: iana.org\n\n" >&3 + + while read -r -t 2 line 0<&3; do + if [[ "${line}" =~ "Date:" ]]; then + time="${line#*':'}"; exec 3<&-; break + fi + done + + exec 3<&- + + if [[ "${time}" ]]; then + epoch="$(date -d "${time}" "+%s")" + echo "$((epoch + 2))" + else + return 1 + fi + else + exec 3<&-; return 1 + fi +} + usage() { prompt -e "Usage function is not implemented"; exit 1 } finalize_argument_parsing() { if [[ "${need_help}" == "true" ]]; then - echo; usage + echo; usage; echo [[ "${has_any_error}" == "true" ]] && exit 1 || exit 0 elif [[ "${has_any_error}" == "true" ]]; then - echo; prompt -i "Try '$0 --help' for more information."; exit 1 - elif [[ "${need_dialog[@]}" =~ "true" ]]; then - echo + echo; prompt -i "Try '$0 --help' for more information."; echo; exit 1 fi } diff --git a/lib-install.sh b/lib-install.sh index 23543a6..63947a1 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -3,8 +3,6 @@ # # WARNING: Don't use "cd" in this shell, use it in a subshell instead, # for example ( cd blabla && do_blabla ) or $( cd .. && do_blabla ) -# -# WARNING: Please don't use sudo directly here since it steals our EXIT trap ############################################################################### # VARIABLES # @@ -17,110 +15,227 @@ WHITESUR_SOURCE+=("lib-install.sh") # DEPENDENCIES # ############################################################################### -install_theme_deps() { - if ! has_command glib-compile-resources || ! has_command sassc || \ - ! has_command xmllint || [[ ! -r "/usr/share/gtk-engines/murrine.xml" ]]; then - echo; prompt -w "'glib2.0', 'sassc', 'xmllint', and 'libmurrine' are required for theme installation." +# Be careful of some distro mechanism, some of them use rolling-release +# based installation instead of point-release, e.g., Arch Linux - # Be careful of some distro mechanism, some of them use rolling-release - # based installation, e.g., Arch Linux +# Rolling-release based distro doesn't have a seprate repo for each different +# build. This can cause a system call error since an app require the compatible +# version of dependencies. In other words, if you install an new app (which you +# definitely reinstall/upgrade the dependency for that app), but your other +# dependencies are old/expired, you'll end up with broken system. - if has_command zypper; then - rootify zypper in -y sassc glib2-devel gtk2-engine-murrine libxml2-tools - elif has_command apt; then - rootify apt install -y sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils - elif has_command dnf; then - rootify dnf install -y sassc glib2-devel gtk-murrine-engine libxml2 - elif has_command yum; then - rootify yum install -y sassc glib2-devel gtk-murrine-engine libxml2 - elif has_command pacman; then - # Explanation A: - # Arch-based distro doesnt have a seprate repo for each different build. - # This can cause a system call error since an app require the compatible - # version of dependencies. In other words, if you install an new app (which - # you definitely reinstall/upgrade the dependency for that app), but your - # other dependencies are old/expired, you'll end up with broken system. - # That's why we need a full system upgrade here - rootify pacman -Syu --noconfirm --needed sassc glib2 gtk-engine-murrine libxml2 - else - prompt -w "WARNING: We're sorry, your distro isn't officially supported yet." - prompt -w "INSTRUCTION: Please make sure you have installed all of the required dependencies. We'll continue the installation in 15 seconds" - prompt -w "INSTRUCTION: Press 'ctrl'+'c' to cancel the installation if you haven't install them yet" - start_animation; sleep 15; stop_animation - fi +# That's why we need a full system upgrade there + +#---------------------SWUPD--------------------# +# 'swupd' bundles just don't make any sense. It takes about 30GB of space only +# for installing a util, e.g. 'sassc' (from 'desktop-dev' bundle, or +# 'os-utils-gui-dev' bundle, or any other 'sassc' provider bundle) + +# Manual package installation is needed for that, but please don't use 'dnf'. +# The known worst impact of using 'dnf' is you install 'sassc' and then you +# remove it, and you run 'sudo dnf upgrade', and boom! Your 'sudo' and other +# system utilities have gone! + +#----------------------APT---------------------# +# Some apt version doesn't update the repo list before it install some app. +# It may cause "unable to fetch..." when you're trying to install them + +#--------------------PACMAN--------------------# +# 'Syu' (with a single y) may causes "could not open ... decompression failed" +# and "target not found ". We got to force 'pacman' to update the repos + +#--------------------OTHERS--------------------# +# Sometimes, some Ubuntu distro doesn't enable automatic time. This can cause +# 'Release file for ... is not valid yet'. This may also happen on other distros + +#============================================# + +#-------------------Prepare------------------# +installation_sorry() { + prompt -w "WARNING: We're sorry, your distro isn't officially supported yet." + prompt -i "INSTRUCTION: Please make sure you have installed all of the required dependencies. We'll continue the installation in 15 seconds" + prompt -i "INSTRUCTION: Press 'ctrl'+'c' to cancel the installation if you haven't install them yet" + start_animation; sleep 15; stop_animation +} + +prepare_deps() { + local remote_time="" + local local_time="" + + prompt -i "DEPS: Checking your internet connection..." + + local_time="$(date -u "+%s")" + + if ! remote_time="$(get_utc_epoch_time)"; then + prompt -e "DEPS ERROR: You have an internet connection issue\n"; exit 1 + fi + + # 5 minutes is the maximum reasonable time delay, so we choose '4' here just + # in case + if (( local_time < remote_time-(4*60) )); then + prompt -w "DEPS: Your system clock is wrong" + prompt -i "DEPS: Updating your system clock..." + # Add "+ 25" here to accomodate potential time delay by sudo prompt + sudo date -s "@$((remote_time + 25))"; sudo hwclock --systohc fi } -install_gdm_deps() { - #TODO: @vince, do we also need "sassc" here? +prepare_swupd() { + [[ "${swupd_prepared}" == "true" ]] && return 0 - if ! has_command glib-compile-resources || ! has_command xmllint || ! has_command sassc; then - echo; prompt -w "'glib2.0', 'xmllint', and 'sassc' are required for theme installation." + local remove="" + local ver="" + local conf="" + local dist="" + + if has_command dnf; then + prompt -w "CLEAR LINUX: You have 'dnf' installed in your system. It may break your system especially when you remove a package" + confirm remove "CLEAR LINUX: You wanna remove it?"; echo + fi + + if ! sudo swupd update -y; then + ver="$(curl -s -o - "${swupd_ver_url}")" + dist="NAME=\"Clear Linux OS\"\nVERSION=1\nID=clear-linux-os\nID_LIKE=clear-linux-os\n" + dist+="VERSION_ID=${ver}\nANSI_COLOR=\"1;35\"\nSUPPORT_URL=\"https://clearlinux.org\"\nBUILD_ID=${ver}" + + prompt -w "\n CLEAR LINUX: Your 'swupd' is broken" + prompt -i "CLEAR LINUX: Patching 'swupd' distro version detection and try again...\n" + sudo rm -rf "/etc/os-release"; echo -e "${dist}" | sudo tee "/usr/lib/os-release" > /dev/null + sudo ln -s "/usr/lib/os-release" "/etc/os-release" + + sudo swupd update -y + fi + + if ! has_command bsdtar; then sudo swupd bundle-add libarchive; fi + if [[ "${remove}" == "y" ]]; then sudo swupd bundle-remove -y dnf; fi + + swupd_prepared="true" +} + +install_swupd_packages() { + if [[ ! "${swupd_packages}" ]]; then + swupd_packages="$(curl -s -o - "${swupd_url}" | awk -F '"' '/-bin-|-lib-/{print $2}')" + fi + + for key in "${@}"; do + for pkg in $(echo "${swupd_packages}" | grep -F "${key}"); do + curl -s -o - "${swupd_url}/${pkg}" | sudo bsdtar -xf - -C "/" + done + done +} + +prepare_install_apt_packages() { + local status="0" + + sudo apt update -y; sudo apt install -y "${@}" || status="${?}" + + if [[ "${status}" == "100" ]]; then + prompt -w "\n APT: Your repo lists might be broken" + prompt -i "APT: Full-cleaning your repo lists and try again...\n" + sudo apt clean -y; sudo rm -rf /var/lib/apt/lists + sudo apt update -y; sudo apt install -y "${@}" + fi +} + +prepare_xbps() { + [[ "${xbps_prepared}" == "true" ]] && return 0 + + # 'xbps-install' requires 'xbps' to be always up-to-date + sudo xbps-install -Syu xbps + + # System upgrading can't remove the old kernel files by it self. It eats the + # boot partition and may cause kernel panic when there is no enough space + sudo vkpurge rm all; sudo xbps-install -Syu + + xbps_prepared="true" +} + +#-----------------Deps-----------------# + +install_theme_deps() { + if ! has_command glib-compile-resources || ! has_command sassc || ! has_command xmllint; then + prompt -w "DEPS: 'glib2.0', 'sassc', and 'xmllint' are required for theme installation." + prepare_deps if has_command zypper; then - rootify zypper in -y glib2-devel libxml2-tools sassc + sudo zypper in -y sassc glib2-devel libxml2-tools + elif has_command swupd; then + # Rolling release + prepare_swupd && sudo swupd bundle-add libglib libxml2 && install_swupd_packages sassc libsass elif has_command apt; then - rootify apt install -y libglib2.0-dev-bin libxml2-utils sassc + prepare_install_apt_packages sassc libglib2.0-dev-bin libxml2-utils elif has_command dnf; then - rootify dnf install -y glib2-devel libxml2 sassc + sudo dnf install -y sassc glib2-devel libxml2 elif has_command yum; then - rootify yum install -y glib2-devel libxml2 sassc + sudo yum install -y sassc glib2-devel libxml2 elif has_command pacman; then - # See Explanation A - rootify pacman -Syu --noconfirm --needed glib2 libxml2 sassc + # Rolling release + sudo pacman -Syyu --noconfirm --needed sassc glib2 libxml2 + elif has_command xbps-install; then + # Rolling release + # 'libxml2' is already included here, and it's gonna broke the installation + # if you add it + prepare_xbps && sudo xbps-install -Sy sassc glib-devel else - prompt -w "WARNING: We're sorry, your distro isn't officially supported yet." - prompt -w "INSTRUCTION: Please make sure you have installed all of the required dependencies. We'll continue the installation in 15 seconds" - prompt -w "INSTRUCTION: Press 'ctrl'+'c' to cancel the installation if you haven't install them yet" - start_animation; sleep 15; stop_animation + installation_sorry fi fi } install_beggy_deps() { if ! has_command convert; then - echo; prompt -w "'imagemagick' are required for background editing." + prompt -w "DEPS: 'imagemagick' is required for background editing." + prepare_deps if has_command zypper; then - rootify zypper in -y ImageMagick + sudo zypper in -y ImageMagick + elif has_command swupd; then + # Rolling release + prepare_swupd && sudo swupd bundle-add ImageMagick elif has_command apt; then - rootify apt install -y imagemagick + prepare_install_apt_packages imagemagick elif has_command dnf; then - rootify dnf install -y ImageMagick + sudo dnf install -y ImageMagick elif has_command yum; then - rootify yum install -y ImageMagick + sudo yum install -y ImageMagick elif has_command pacman; then - # See Explanation A - rootify pacman -Syu --noconfirm --needed imagemagick + # Rolling release + sudo pacman -Syyu --noconfirm --needed imagemagick + elif has_command xbps-install; then + # Rolling release + prepare_xbps && sudo xbps-install -Sy ImageMagick else - prompt -w "WARNING: We're sorry, your distro isn't officially supported yet." - prompt -w "INSTRUCTION: Please make sure you have installed all of the required dependencies. We'll continue the installation in 15 seconds" - prompt -w "INSTRUCTION: Press 'ctrl'+'c' to cancel the installation if you haven't install them yet" - start_animation; sleep 15; stop_animation + installation_sorry fi fi } install_dialog_deps() { + [[ "${silent_mode}" == "true" ]] && return 0 + if ! has_command dialog; then - echo; prompt -w "'dialog' are required for this option." + prompt -w "DEPS: 'dialog' is required for this option." + prepare_deps if has_command zypper; then - rootify zypper in -y dialog + sudo zypper in -y dialog + elif has_command swupd; then + # Rolling release + prepare_swupd && install_swupd_packages dialog elif has_command apt; then - rootify apt install -y dialog + prepare_install_apt_packages dialog elif has_command dnf; then - rootify dnf install -y dialog + sudo dnf install -y dialog elif has_command yum; then - rootify yum install -y dialog + sudo yum install -y dialog elif has_command pacman; then - # See Explanation A - rootify pacman -Syu --noconfirm --needed dialog + # Rolling release + sudo pacman -Syyu --noconfirm --needed dialog + elif has_command xbps-install; then + # Rolling release + prepare_xbps && sudo xbps-install -Sy dialog else - prompt -w "WARNING: We're sorry, your distro isn't officially supported yet." - prompt -w "INSTRUCTION: Please make sure you have installed all of the required dependencies. We'll continue the installation in 15 seconds" - prompt -w "INSTRUCTION: Press 'ctrl'+'c' to cancel the installation if you haven't install them yet" - start_animation; sleep 15; stop_animation + installation_sorry fi fi } @@ -151,7 +266,9 @@ install_beggy() { ;; *) if [[ "${no_blur}" == "false" || "${darken}" == "true" ]]; then - install_beggy_deps && convert "${background}" ${CONVERT_OPT} "${WHITESUR_TMP_DIR}/beggy.png" + install_beggy_deps; start_animation + convert "${background}" ${CONVERT_OPT} "${WHITESUR_TMP_DIR}/beggy.png" + stop_animation else cp -r "${background}" "${WHITESUR_TMP_DIR}/beggy.png" fi @@ -163,6 +280,7 @@ install_darky() { local opacity="$(destify ${1})" local theme="$(destify ${2})" + install_theme_deps sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-3.0/gtk-dark.scss" "${WHITESUR_TMP_DIR}/darky-3.css" sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk-dark.scss" "${WHITESUR_TMP_DIR}/darky-4.css" } @@ -201,6 +319,8 @@ install_shelly() { TARGET_DIR="${6}" fi + install_theme_deps + mkdir -p "${TARGET_DIR}" mkdir -p "${TARGET_DIR}/assets" cp -r "${THEME_SRC_DIR}/assets/gnome-shell/icons" "${TARGET_DIR}" @@ -253,20 +373,23 @@ install_theemy() { local TMP_DIR_F="${WHITESUR_TMP_DIR}/gtk-4.0${color}${opacity}${alt}${theme}" mkdir -p "${TARGET_DIR}" - local desktop_entry=" - [Desktop Entry] - Type=X-GNOME-Metatheme - Name=${name}${color}${opacity}${alt}${theme} - Comment=A MacOS BigSur like Gtk+ theme based on Elegant Design - Encoding=UTF-8 - [X-GNOME-Metatheme] - GtkTheme=${name}${color}${opacity}${alt}${theme} - MetacityTheme=${name}${color}${opacity}${alt}${theme} - IconTheme=${name}${iconcolor} - CursorTheme=WhiteSur-cursors - ButtonLayout=close,minimize,maximize:menu" - echo "${desktop_entry}" > "${TARGET_DIR}/index.theme" + local desktop_entry="[Desktop Entry]\n" + desktop_entry+="Type=X-GNOME-Metatheme\n" + desktop_entry+="Name=${name}${color}${opacity}${alt}${theme}\n" + desktop_entry+="Comment=A MacOS BigSur like Gtk+ theme based on Elegant Design\n" + desktop_entry+="Encoding=UTF-8\n\n" + + desktop_entry+="[X-GNOME-Metatheme]\n" + desktop_entry+="GtkTheme=${name}${color}${opacity}${alt}${theme}\n" + desktop_entry+="MetacityTheme=${name}${color}${opacity}${alt}${theme}\n" + desktop_entry+="IconTheme=${name}${iconcolor}\n" + desktop_entry+="CursorTheme=WhiteSur-cursors\n" + desktop_entry+="ButtonLayout=close,minimize,maximize:menu\n" + + echo -e "${desktop_entry}" > "${TARGET_DIR}/index.theme" + + install_theme_deps #--------------------GTK-3.0--------------------# @@ -357,7 +480,7 @@ install_themes() { # "install_theemy" and "install_shelly" require "gtk_base", so multithreading # isn't possible - start_animation; install_beggy + install_theme_deps; start_animation; install_beggy for opacity in "${opacities[@]}"; do for alt in "${alts[@]}"; do @@ -394,10 +517,10 @@ remove_themes() { } install_gdm_theme() { - start_animation local TARGET= # Let's go! + install_theme_deps rm -rf "${WHITESUR_GS_DIR}"; install_beggy gtk_base "${colors[0]}" "${opacities[0]}" "${themes[0]}" @@ -435,8 +558,6 @@ install_gdm_theme() { # Fix previously installed WhiteSur restore_file "${ETC_GR_FILE}" fi - - stop_animation } revert_gdm_theme() { @@ -461,8 +582,8 @@ install_firefox_theme() { fi remove_firefox_theme - userify mkdir -p "${TARGET_DIR}" - userify cp -rf "${FIREFOX_SRC_DIR}"/* "${TARGET_DIR}" + udo mkdir -p "${TARGET_DIR}" + udo cp -rf "${FIREFOX_SRC_DIR}"/* "${TARGET_DIR}" config_firefox } @@ -482,14 +603,14 @@ config_firefox() { for d in "${FIREFOX_DIR}/"*"default"*; do if [[ -f "${d}/prefs.js" ]]; then - rm -rf "${d}/chrome" - userify ln -sf "${TARGET_DIR}" "${d}/chrome" - userify_file "${d}/prefs.js" - echo "user_pref(\"toolkit.legacyUserProfileCustomizations.stylesheets\", true);" >> "${d}/prefs.js" - echo "user_pref(\"browser.tabs.drawInTitlebar\", true);" >> "${d}/prefs.js" - echo "user_pref(\"browser.uidensity\", 0);" >> "${d}/prefs.js" - echo "user_pref(\"layers.acceleration.force-enabled\", true);" >> "${d}/prefs.js" - echo "user_pref(\"mozilla.widget.use-argb-visuals\", true);" >> "${d}/prefs.js" + rm -rf "${d}/chrome" + udo ln -sf "${TARGET_DIR}" "${d}/chrome" + udoify_file "${d}/prefs.js" + echo "user_pref(\"toolkit.legacyUserProfileCustomizations.stylesheets\", true);" >> "${d}/prefs.js" + echo "user_pref(\"browser.tabs.drawInTitlebar\", true);" >> "${d}/prefs.js" + echo "user_pref(\"browser.uidensity\", 0);" >> "${d}/prefs.js" + echo "user_pref(\"layers.acceleration.force-enabled\", true);" >> "${d}/prefs.js" + echo "user_pref(\"mozilla.widget.use-argb-visuals\", true);" >> "${d}/prefs.js" fi done } @@ -504,8 +625,8 @@ edit_firefox_theme_prefs() { fi [[ ! -d "${TARGET_DIR}" ]] && install_firefox_theme ; config_firefox - userify ${EDITOR:-nano} "${TARGET_DIR}/userChrome.css" - userify ${EDITOR:-nano} "${TARGET_DIR}/customChrome.css" + udo ${EDITOR:-nano} "${TARGET_DIR}/userChrome.css" + udo ${EDITOR:-nano} "${TARGET_DIR}/customChrome.css" } remove_firefox_theme() { @@ -526,22 +647,22 @@ install_dash_to_dock_theme() { gtk_base "${colors[0]}" "${opacities[0]}" "${themes[0]}" if [[ -d "${DASH_TO_DOCK_DIR_HOME}" ]]; then - backup_file "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" "userify" - userify_file "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" - userify sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet$(destify ${colors[0]}).scss" "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" + backup_file "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" "udo" + udoify_file "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" + udo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet$(destify ${colors[0]}).scss" "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" elif [[ -d "${DASH_TO_DOCK_DIR_ROOT}" ]]; then - backup_file "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" "rootify" - rootify sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet$(destify ${colors[0]}).scss" "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" + backup_file "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" "sudo" + sudo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet$(destify ${colors[0]}).scss" "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" fi - userify dbus-launch dconf write /org/gnome/shell/extensions/dash-to-dock/apply-custom-theme true + udo dbus-launch dconf write /org/gnome/shell/extensions/dash-to-dock/apply-custom-theme true } revert_dash_to_dock_theme() { if [[ -d "${DASH_TO_DOCK_DIR_HOME}" ]]; then - restore_file "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" "userify" + restore_file "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" "udo" elif [[ -d "${DASH_TO_DOCK_DIR_ROOT}" ]]; then - restore_file "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" "rootify" + restore_file "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" "sudo" fi } @@ -550,26 +671,26 @@ revert_dash_to_dock_theme() { ############################################################################### connect_flatpak() { - rootify flatpak override --filesystem=~/.themes + sudo flatpak override --filesystem=~/.themes } disconnect_flatpak() { - rootify flatpak override --nofilesystem=~/.themes + sudo flatpak override --nofilesystem=~/.themes } connect_snap() { - rootify snap install whitesur-gtk-theme + sudo snap install whitesur-gtk-theme for i in $(snap connections | grep gtk-common-themes | awk '{print $2}' | cut -f1 -d: | sort -u); do - rootify snap connect "${i}:gtk-3-themes" "whitesur-gtk-theme:gtk-3-themes" - rootify snap connect "${i}:icon-themes" "whitesur-gtk-theme:icon-themes" + sudo snap connect "${i}:gtk-3-themes" "whitesur-gtk-theme:gtk-3-themes" + sudo snap connect "${i}:icon-themes" "whitesur-gtk-theme:icon-themes" done } disconnect_snap() { for i in $(snap connections | grep gtk-common-themes | awk '{print $2}' | cut -f1 -d: | sort -u); do - rootify snap disconnect "${i}:gtk-3-themes" "whitesur-gtk-theme:gtk-3-themes" - rootify snap disconnect "${i}:icon-themes" "whitesur-gtk-theme:icon-themes" + sudo snap disconnect "${i}:gtk-3-themes" "whitesur-gtk-theme:gtk-3-themes" + sudo snap disconnect "${i}:icon-themes" "whitesur-gtk-theme:icon-themes" done } @@ -651,73 +772,21 @@ customize_theme() { # values are taken from _variables.scss show_panel_opacity_dialog() { - if [[ -x /usr/bin/dialog ]]; then - tui=$(dialog --backtitle "${THEME_NAME} gtk theme installer" \ - --radiolist "Choose your panel background opacity - (Default is 0.15. The less value, the more transparency!):" 20 50 10 \ - 0 "${PANEL_OPACITY_VARIANTS[0]}" on \ - 1 "0.${PANEL_OPACITY_VARIANTS[1]}" off \ - 2 "0.${PANEL_OPACITY_VARIANTS[2]}" off \ - 3 "0.${PANEL_OPACITY_VARIANTS[3]}" off \ - 4 "0.${PANEL_OPACITY_VARIANTS[4]}" off --output-fd 1 ) - case "$tui" in - 0) panel_opacity="${PANEL_OPACITY_VARIANTS[0]}" ;; - 1) panel_opacity="${PANEL_OPACITY_VARIANTS[1]}" ;; - 2) panel_opacity="${PANEL_OPACITY_VARIANTS[2]}" ;; - 3) panel_opacity="${PANEL_OPACITY_VARIANTS[3]}" ;; - 4) panel_opacity="${PANEL_OPACITY_VARIANTS[4]}" ;; - *) operation_aborted ;; - esac - fi - - clear + install_dialog_deps + dialogify panel_opacity "${THEME_NAME}" "Choose your panel opacity (Default is 15)" ${PANEL_OPACITY_VARIANTS[*]} } show_sidebar_size_dialog() { - if [[ -x /usr/bin/dialog ]]; then - tui=$(dialog --backtitle "${THEME_NAME} gtk theme installer" \ - --radiolist "Choose your Nautilus sidebar size (default is 200px width):" 15 40 5 \ - 0 "${SIDEBAR_SIZE_VARIANTS[0]}" on \ - 1 "${SIDEBAR_SIZE_VARIANTS[1]}px" off \ - 2 "${SIDEBAR_SIZE_VARIANTS[2]}px" off \ - 3 "${SIDEBAR_SIZE_VARIANTS[3]}px" off \ - 4 "${SIDEBAR_SIZE_VARIANTS[4]}px" off --output-fd 1 ) - case "$tui" in - 0) sidebar_size="${SIDEBAR_SIZE_VARIANTS[0]}" ;; - 1) sidebar_size="${SIDEBAR_SIZE_VARIANTS[1]}" ;; - 2) sidebar_size="${SIDEBAR_SIZE_VARIANTS[2]}" ;; - 3) sidebar_size="${SIDEBAR_SIZE_VARIANTS[3]}" ;; - 4) sidebar_size="${SIDEBAR_SIZE_VARIANTS[4]}" ;; - *) operation_aborted ;; - esac - fi - - clear + install_dialog_deps + dialogify sidebar_size "${THEME_NAME}" "Choose your Nautilus minimum sidebar size (default is 200px)" ${SIDEBAR_SIZE_VARIANTS[*]} } show_nautilus_style_dialog() { - if [[ -x /usr/bin/dialog ]]; then - tui=$(dialog --backtitle "${THEME_NAME} gtk theme installer" \ - --radiolist "Choose your Nautilus style (default is BigSur-like style):" 15 40 5 \ - 0 "${NAUTILUS_STYLE_VARIANTS[0]}" on \ - 1 "${NAUTILUS_STYLE_VARIANTS[1]}" off \ - 1 "${NAUTILUS_STYLE_VARIANTS[2]}" off \ - 2 "${NAUTILUS_STYLE_VARIANTS[3]}" off --output-fd 1 ) - case "$tui" in - 0) nautilus_style="${NAUTILUS_STYLE_VARIANTS[0]}" ;; - 1) nautilus_style="${NAUTILUS_STYLE_VARIANTS[1]}" ;; - 2) nautilus_style="${NAUTILUS_STYLE_VARIANTS[2]}" ;; - 3) nautilus_style="${NAUTILUS_STYLE_VARIANTS[3]}" ;; - *) operation_aborted ;; - esac - fi - - clear + install_dialog_deps + dialogify nautilus_style "${THEME_NAME}" "Choose your Nautilus style (default is BigSur-like style)" ${NAUTILUS_STYLE_VARIANTS[*]} } show_needed_dialogs() { - if [[ "${need_dialog[@]}" =~ "true" ]]; then install_dialog_deps; fi - if [[ "${need_dialog["-p"]}" == "true" ]]; then show_panel_opacity_dialog; fi if [[ "${need_dialog["-s"]}" == "true" ]]; then show_sidebar_size_dialog; fi if [[ "${need_dialog["-N"]}" == "true" ]]; then show_nautilus_style_dialog; fi diff --git a/src/main/gtk-2.0/common/main.rc b/src/main/gtk-2.0/common/main.rc index 4d04c36..d0a410d 100644 --- a/src/main/gtk-2.0/common/main.rc +++ b/src/main/gtk-2.0/common/main.rc @@ -962,12 +962,9 @@ style "menu_item" { } style "button" { - xthickness = 4 ythickness = 4 - engine "murrine" { textstyle = 0 } - engine "pixmap" { image { @@ -1047,8 +1044,6 @@ style "button_label" { fg[INSENSITIVE] = @insensitive_button_fg_color fg[ACTIVE] = @fg_color - engine "murrine" { textstyle = 0 } - } style "checkbutton" { @@ -2341,15 +2336,6 @@ style "xfwm-tabwin" { bg[SELECTED] = @bg_color fg[NORMAL] = @fg_color - - engine "murrine" { - contrast = 0.7 - glazestyle = 0 - glowstyle = 0 - highlight_shade = 1.0 - gradient_shades = {1.0,1.0,1.0,1.0} - border_shades = { 0.8, 0.8 } - } } style "xfwm-tabwin-button" { @@ -2367,12 +2353,6 @@ style "chrome_menu_item" { # Text Style style "text" = "default" { fg[NORMAL] = @fg_color # FIXME: VMWare needs this? - - engine "murrine" { textstyle = 0 } -} - -style "menu_text" = "menu_item" { - engine "murrine" { textstyle = 0 } } style "null" { @@ -2479,7 +2459,6 @@ widget "xfwm4-tabwin*GtkButton*" style "xfwm- # Fixes ugly text shadows for insensitive text widget_class "*" style "text" -widget_class "**" style "menu_text" widget_class "**" style "text" widget_class "**" style "text" widget_class "**" style "text" diff --git a/src/main/gtk-2.0/common/panel.rc b/src/main/gtk-2.0/common/panel.rc index 1f74a8e..178128b 100644 --- a/src/main/gtk-2.0/common/panel.rc +++ b/src/main/gtk-2.0/common/panel.rc @@ -89,7 +89,6 @@ style "regular-label" { } style "theme-panel-text" { - fg[NORMAL] = shade(1.0, @tooltip_fg_color) fg[PRELIGHT] = @tooltip_fg_color fg[ACTIVE] = shade(1.0, @tooltip_fg_color) @@ -97,15 +96,9 @@ style "theme-panel-text" { text[NORMAL] = shade(1.0, @tooltip_fg_color) text[PRELIGHT] = @tooltip_fg_color text[ACTIVE] = shade(1.0, @tooltip_fg_color) - - engine "murrine" { - textstyle = 0 - text_shade = 0.2 - } } style "panel-entry" { - fg[NORMAL] = @text_color fg[PRELIGHT] = @text_color fg[ACTIVE] = @text_color @@ -117,7 +110,6 @@ style "panel-entry" { text[ACTIVE] = @text_color text[SELECTED] = @text_color text[INSENSITIVE] = @text_color - } style "theme-main-menu-text" = "theme-panel-text" { diff --git a/src/main/gtk-2.0/common/xfce-notify.rc b/src/main/gtk-2.0/common/xfce-notify.rc index 98403a7..3ac7956 100644 --- a/src/main/gtk-2.0/common/xfce-notify.rc +++ b/src/main/gtk-2.0/common/xfce-notify.rc @@ -18,13 +18,6 @@ style "notify-button" { fg[NORMAL] = @tooltip_fg_color fg[PRELIGHT] = shade(1.1, @tooltip_fg_color) fg[ACTIVE] = @selected_fg_color - - engine "murrine" { - gradient_shades = { 1.0, 1.0, 1.0, 1.0 } - border_shades = { 1.0, 1.0 } - roundness = 2 - textstyle = 0 - } } style "notify-text" { @@ -33,10 +26,6 @@ style "notify-text" { fg[NORMAL] = shade(1.0, @tooltip_fg_color) fg[PRELIGHT] = shade(1.1, @tooltip_fg_color) fg[ACTIVE] = shade(1.0, @tooltip_fg_color) - - engine "murrine" { - textstyle = 0 - } } style "notify-summary" { @@ -53,16 +42,6 @@ style "notify-progressbar" { bg[NORMAL] = @selected_bg_color bg[ACTIVE] = shade(0.8, @tooltip_bg_color) bg[SELECTED] = @selected_bg_color - - engine "murrine" { - gradient_shades = { 1.0, 1.0, 1.0, 1.0 } - border_shades = { 1.0, 1.0 } - trough_shades = { 1.0, 1.0 } - trough_border_shades = { 1.0, 1.0 } - progressbarstyle = 0 - roundness = 2 - textstyle = 0 - } } class "XfceNotifyWindow" style "notify-window" diff --git a/src/main/gtk-2.0/menubar-toolbar-dark.rc b/src/main/gtk-2.0/menubar-toolbar-dark.rc index bef3ad3..55d05ff 100644 --- a/src/main/gtk-2.0/menubar-toolbar-dark.rc +++ b/src/main/gtk-2.0/menubar-toolbar-dark.rc @@ -61,16 +61,6 @@ style "menubar_item" { } } -# Text Style Menubar -style "menubar-text" { - - engine "murrine" { - text_shade = 0.0 - textstyle = 0 - } -} - - style "toolbar_text" { fg[NORMAL] = @tooltip_fg_color fg[PRELIGHT] = shade(1.15, @tooltip_fg_color) @@ -211,14 +201,11 @@ widget_class "*ThunarWindow*" style "menub class "ChromeGtkFrame" style "chrome-gtk-frame" -widget_class "***" style "menubar-text" - # Whitelist for dark toolbars widget_class "*ThunarWindow*" style "menubar-borderless" widget_class "*ThunarWindow**" style "toolbar_entry" widget_class "*ThunarWindow**" style "toolbar_button" widget_class "*ThunarWindow**" style "toolbar_text" -widget_class "*ThunarWindow***" style "menubar-text" # GtkCheckButton widget_class "*" style "button" diff --git a/src/main/gtk-2.0/menubar-toolbar-light.rc b/src/main/gtk-2.0/menubar-toolbar-light.rc index 9c562ec..9a22d7e 100644 --- a/src/main/gtk-2.0/menubar-toolbar-light.rc +++ b/src/main/gtk-2.0/menubar-toolbar-light.rc @@ -61,15 +61,6 @@ style "menubar_item" { } } -# Text Style Menubar -style "menubar-text" { - - engine "murrine" { - text_shade = 0.0 - textstyle = 0 - } -} - style "toolbar_entry" { text[NORMAL] = @text_color @@ -153,8 +144,6 @@ widget_class "*CajaNavigationWindow*" style "menub class "ChromeGtkFrame" style "chrome-gtk-frame" -widget_class "***" style "menubar-text" - # Whitelist for dark toolbars widget_class "*ThunarWindow*" style "menubar" widget_class "*CajaNavigationWindow*" style "menubar" @@ -163,5 +152,3 @@ widget_class "*CajaNavigationWindow**" style "toolb # GtkCheckButton widget_class "**" style "toolbar_button" -widget_class "***" style "misc_button_label" - diff --git a/src/other/firefox/userChrome.css b/src/other/firefox/userChrome.css index b37233e..9fde56b 100644 --- a/src/other/firefox/userChrome.css +++ b/src/other/firefox/userChrome.css @@ -24,7 +24,7 @@ /* Active tab high contrast */ /*@import "WhiteSur/active-tab-contrast.css"; /**/ -/* Use system theme icons instead of Adwaita icons included by theme */ +/* Use system theme icons instead of Adwaita icons included by theme [BUGGED] */ /*@import "WhiteSur/system-icons.css"; /**/ /* Allow drag window from headerbar buttons (GNOMISH) [BUGGED] diff --git a/tweaks.sh b/tweaks.sh index cf4caa8..6e5577e 100755 --- a/tweaks.sh +++ b/tweaks.sh @@ -3,10 +3,10 @@ # WARNING: Please make this shell not working-directory dependant, for example # instead of using 'ls blabla', use 'ls "${REPO_DIR}/blabla"' # -# WARNING: Please don't use sudo directly here since it steals our EXIT trap -# # WARNING: Don't use "cd" in this shell, use it in a subshell instead, # for example ( cd blabla && do_blabla ) or $( cd .. && do_blabla ) +# +# SUGGESTION: Please don't put any dependency installation here ############################################################################### # VARIABLES & HELP # @@ -34,6 +34,7 @@ usage() { helpify "-p, --panel" "[$(IFS='|'; echo "${PANEL_OPACITY_VARIANTS[*]}")]" "Set '${THEME_NAME}' GDM (GNOME Shell) theme panel transparency" "Default is 15%" helpify "-i, --icon" "[$(IFS='|'; echo "${ICON_VARIANTS[*]}")]" "Set '${THEME_NAME}' GDM (GNOME Shell) 'Activities' icon" "Default is 'standard'" helpify "-r, --remove, --revert" "" "Revert to the original themes, do the opposite things of install and connect" "" + helpify "--silent-mode" "" "Meant for developers: ignore any confirm prompt and params become more strict" "" helpify "-h, --help" "" "Show this help" "" } @@ -43,6 +44,8 @@ usage() { #-----------------------------PARSE ARGUMENTS---------------------------------# +echo + while [[ $# -gt 0 ]]; do # Don't show any dialog here. Let this loop checks for errors or shows help # We can only show dialogs when there's no error and no -r parameter @@ -57,6 +60,8 @@ while [[ $# -gt 0 ]]; do # Parameters that don't require value -r|--remove|--revert) uninstall='true'; shift ;; + --silent-mode) + full_sudo "${1}"; silent_mode='true'; shift ;; -h|--help) need_help="true"; shift ;; -f|--firefox|-e|--edit-firefox) @@ -93,7 +98,7 @@ while [[ $# -gt 0 ]]; do has_any_error="true" fi; shift ;; -g|--gdm) - gdm="true"; full_rootify "${1}" + gdm="true"; full_sudo "${1}" if ! has_command gdm && ! has_command gdm3 && [[ ! -e /usr/sbin/gdm3 ]]; then prompt -e "'${1}' ERROR: There's no GDM installed in your system" @@ -137,88 +142,86 @@ finalize_argument_parsing #---------------------------START INSTALL THEMES-------------------------------# if [[ "${uninstall}" == 'true' ]]; then - echo; prompt -w "REMOVAL: Non file-related parameters will be ignored." + prompt -w "REMOVAL: Non file-related parameters will be ignored." if [[ "${gdm}" == 'true' ]]; then - echo; prompt -i "Removing '${name}' GDM theme..." + prompt -i "Removing '${name}' GDM theme..." revert_gdm_theme - echo; prompt -s "Done! '${name}' GDM theme has been removed." + prompt -s "Done! '${name}' GDM theme has been removed."; echo fi if [[ "${dash_to_dock}" == 'true' ]]; then - echo; prompt -i "Removing '${name}' Dash to Dock theme..." + prompt -i "Removing '${name}' Dash to Dock theme..." revert_dash_to_dock_theme - echo; prompt -s "Done! '${name}' Dash to Dock theme has been removed." + prompt -s "Done! '${name}' Dash to Dock theme has been removed."; echo fi if [[ "${firefox}" == 'true' ]]; then - echo; prompt -i "Removing '${name}' Firefox theme..." + prompt -i "Removing '${name}' Firefox theme..." remove_firefox_theme - echo; prompt -s "Done! '${name}' Firefox theme has been removed." + prompt -s "Done! '${name}' Firefox theme has been removed."; echo fi if [[ "${snap}" == 'true' ]]; then - echo; prompt -i "Disconnecting '${name}' theme from your installed snap apps..." + prompt -i "Disconnecting '${name}' theme from your installed snap apps..." disconnect_snap - echo; prompt -s "Done! '${name}' theme has been disconnected from your snap apps." + prompt -s "Done! '${name}' theme has been disconnected from your snap apps."; echo fi if [[ "${flatpak}" == 'true' ]]; then - echo; prompt -i "Disconnecting '${name}' theme from your Flatpak..." + prompt -i "Disconnecting '${name}' theme from your Flatpak..." disconnect_flatpak - echo; prompt -s "Done! '${name}' theme has been disconnected from your Flatpak." + prompt -s "Done! '${name}' theme has been disconnected from your Flatpak."; echo fi else show_needed_dialogs; customize_theme if [[ "${gdm}" == 'true' ]]; then - echo; prompt -i "Installing '${name}' GDM theme..." - install_gdm_deps; install_gdm_theme - echo; prompt -s "Done! '${name}' GDM theme has been installed." + prompt -i "Installing '${name}' GDM theme..." + install_gdm_theme + prompt -s "Done! '${name}' GDM theme has been installed."; echo fi if [[ "${dash_to_dock}" == 'true' ]]; then - echo; prompt -i "Installing '${name}' ${colors[0]} Dash to Dock theme..." + prompt -i "Installing '${name}' ${colors[0]} Dash to Dock theme..." install_dash_to_dock_theme - echo; prompt -s "Done! '${name}' Dash to Dock theme has been installed." - prompt -w "DASH TO DOCK: You may need to logout to take effect." + prompt -s "Done! '${name}' Dash to Dock theme has been installed." + prompt -w "DASH TO DOCK: You may need to logout to take effect."; echo fi if [[ "${firefox}" == 'true' || "${edit_firefox}" == 'true' ]]; then if [[ "${firefox}" == 'true' ]]; then - echo; prompt -i "Installing '${name}' Firefox theme..." + prompt -i "Installing '${name}' Firefox theme..." install_firefox_theme - echo; prompt -s "Done! '${name}' Firefox theme has been installed." + prompt -s "Done! '${name}' Firefox theme has been installed."; echo fi if [[ "${edit_firefox}" == 'true' ]]; then - echo; prompt -i "Editing '${name}' Firefox theme preferences..." + prompt -i "Editing '${name}' Firefox theme preferences..." edit_firefox_theme_prefs - echo; prompt -s "Done! '${name}' Firefox theme preferences has been edited." + prompt -s "Done! '${name}' Firefox theme preferences has been edited."; echo fi - echo prompt -w "FIREFOX: Please go to [Firefox menu] > [Customize...], and customize your Firefox to make it work. Move your 'new tab' button to the titlebar instead of tab-switcher." - prompt -w "FIREFOX: Anyways, you can also edit 'userChrome.css' and 'customChrome.css' later in your Firefox profile directory." + prompt -i "FIREFOX: Anyways, you can also edit 'userChrome.css' and 'customChrome.css' later in your Firefox profile directory." + echo fi if [[ "${snap}" == 'true' ]]; then - echo; prompt -i "Connecting '${name}' theme to your installed snap apps..." + prompt -i "Connecting '${name}' theme to your installed snap apps..." connect_snap - echo; prompt -s "Done! '${name}' theme has been connected to your snap apps." + prompt -s "Done! '${name}' theme has been connected to your snap apps."; echo fi if [[ "${flatpak}" == 'true' ]]; then - echo; prompt -i "Connecting '${name}' theme to your Flatpak..." + prompt -i "Connecting '${name}' theme to your Flatpak..." connect_flatpak - echo; prompt -s "Done! '${name}' theme has been connected to your Flatpak." + prompt -s "Done! '${name}' theme has been connected to your Flatpak."; echo fi fi if [[ "${firefox}" == "false" && "${edit_firefox}" == "false" && "${flatpak}" == "false" && "${snap}" == "false" && "${gdm}" == "false" && "${dash_to_dock}" == "false" ]]; then - echo; prompt -e "Oops... there's nothing to tweak..." - echo; prompt -i "HINT: Don't forget to define which component to tweak, e.g. '--gdm'" - echo; prompt -i "HINT: Run ./tweaks.sh -h for help!..." + prompt -e "Oops... there's nothing to tweak..." + prompt -i "HINT: Don't forget to define which component to tweak, e.g. '--gdm'" + prompt -i "HINT: Run ./tweaks.sh -h for help!..."; echo fi - -echo