From 0bb8149c6e23faf34cb780c480c7cf251d981ced Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Mon, 7 Jun 2021 08:32:52 +0700 Subject: [PATCH 01/40] Add support for Void Linux --- lib-core.sh | 2 +- lib-install.sh | 52 +++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index 8f864f1..025f0b9 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -257,7 +257,7 @@ operation_aborted() { 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 diff --git a/lib-install.sh b/lib-install.sh index 23543a6..75f79c4 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -23,7 +23,15 @@ install_theme_deps() { 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, e.g., Arch Linux + # based installation instead of point-release, 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. + + # That's why we need a full system upgrade here if has_command zypper; then rootify zypper in -y sassc glib2-devel gtk2-engine-murrine libxml2-tools @@ -34,14 +42,15 @@ install_theme_deps() { 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 + # Rolling release rootify pacman -Syu --noconfirm --needed sassc glib2 gtk-engine-murrine libxml2 + elif has_command xbps-install; then + # Rolling release + # 'xbps-install' requires 'xbps' to be always up-to-date + rootify xbps-install -Syu xbps sassc glib-devel gtk-engine-murrine libxml2 + # 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 + rootify vkpurge rm all 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" @@ -66,8 +75,15 @@ install_gdm_deps() { elif has_command yum; then rootify yum install -y glib2-devel libxml2 sassc elif has_command pacman; then - # See Explanation A + # Rolling release rootify pacman -Syu --noconfirm --needed glib2 libxml2 sassc + elif has_command xbps-install; then + # Rolling release + # 'xbps-install' requires 'xbps' to be always up-to-date + rootify xbps-install -Syu xbps glib-devel libxml2 sassc + # 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 + rootify vkpurge rm all 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" @@ -90,8 +106,15 @@ install_beggy_deps() { elif has_command yum; then rootify yum install -y ImageMagick elif has_command pacman; then - # See Explanation A + # Rolling release rootify pacman -Syu --noconfirm --needed imagemagick + elif has_command xbps-install; then + # Rolling release + # 'xbps-install' requires 'xbps' to be always up-to-date + rootify xbps-install -Syu xbps ImageMagick + # 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 + rootify vkpurge rm all 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" @@ -114,8 +137,15 @@ install_dialog_deps() { elif has_command yum; then rootify yum install -y dialog elif has_command pacman; then - # See Explanation A + # Rolling release rootify pacman -Syu --noconfirm --needed dialog + elif has_command xbps-install; then + # Rolling release + # 'xbps-install' requires 'xbps' to be always up-to-date + rootify xbps-install -Syu xbps dialog + # 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 + rootify vkpurge rm all 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" From f42a270fb55e2572c5c47fec7d79d2a3ae46cf45 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Mon, 7 Jun 2021 13:58:56 +0700 Subject: [PATCH 02/40] Add templates, relicense, and error info fix --- .github/ISSUE_TEMPLATE/glitch.md | 10 + .github/ISSUE_TEMPLATE/idea.md | 10 + .github/ISSUE_TEMPLATE/installation.md | 10 + .github/pull_request_template.md | 1 + CODE_OF_CONDUCT.md | 128 +++++ COPYING | 693 +------------------------ README.md | 32 +- SECURITY.md | 13 + lib-core.sh | 2 +- 9 files changed, 209 insertions(+), 690 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/glitch.md create mode 100644 .github/ISSUE_TEMPLATE/idea.md create mode 100644 .github/ISSUE_TEMPLATE/installation.md create mode 100644 .github/pull_request_template.md create mode 100644 CODE_OF_CONDUCT.md create mode 100644 SECURITY.md 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/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/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..3778ea6 --- /dev/null +++ b/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/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 553cd20..075c407 100644 --- a/README.md +++ b/README.md @@ -8,20 +8,20 @@ # Installation is easy!
Required dependencies info for nerds -### Gtk2 theme required +### GTK2 theme deps - 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,11 +29,13 @@ 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)
@@ -41,16 +43,16 @@ Don't worry, WhiteSur installer already provides all of those dependencies. ## 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. +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 +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 +149,7 @@ control button variant, etc. # Let's tweak! Usage: `./tweaks.sh [OPTIONS...]` -
TWEAKS OPTIONS +
Options ```bash -f, --firefox @@ -238,7 +240,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 +255,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: diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..cb4df10 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,13 @@ +# 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 diff --git a/lib-core.sh b/lib-core.sh index 025f0b9..69f39ea 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -217,7 +217,7 @@ signal_exit() { operation_aborted() { 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" | sort -u)) local repo_ver="" local lines=() From d865ae5da9f04cfcd647d557be536f829eb360fa Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Mon, 7 Jun 2021 18:31:45 +0700 Subject: [PATCH 03/40] Rearrange files --- AUTHORS => .github/AUTHORS | 0 CODE_OF_CONDUCT.md => .github/CODE_OF_CONDUCT.md | 0 CONTRIBUTING.md => .github/CONTRIBUTING.md | 0 SECURITY.md => .github/SECURITY.md | 1 + README.md | 4 ++-- lib-install.sh | 16 ++++++++++++---- 6 files changed, 15 insertions(+), 6 deletions(-) rename AUTHORS => .github/AUTHORS (100%) rename CODE_OF_CONDUCT.md => .github/CODE_OF_CONDUCT.md (100%) rename CONTRIBUTING.md => .github/CONTRIBUTING.md (100%) rename SECURITY.md => .github/SECURITY.md (94%) diff --git a/AUTHORS b/.github/AUTHORS similarity index 100% rename from AUTHORS rename to .github/AUTHORS diff --git a/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md similarity index 100% rename from CODE_OF_CONDUCT.md rename to .github/CODE_OF_CONDUCT.md diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to .github/CONTRIBUTING.md diff --git a/SECURITY.md b/.github/SECURITY.md similarity index 94% rename from SECURITY.md rename to .github/SECURITY.md index cb4df10..c48059e 100644 --- a/SECURITY.md +++ b/.github/SECURITY.md @@ -11,3 +11,4 @@ ## Reporting a Vulnerability Report a security vulnerability to https://github.com/vinceliuice/WhiteSur-gtk-theme/issues +with a blank template diff --git a/README.md b/README.md index 075c407..ac38144 100644 --- a/README.md +++ b/README.md @@ -42,10 +42,10 @@ Don't worry, WhiteSur installer already provides all of those dependencies. ## Quick install -### Use the stable package +### Using a stable package Choose a [stable package](stable-release) and unzip it to the user theme folder `~/.themes`. -### Compile from source +### 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. diff --git a/lib-install.sh b/lib-install.sh index 75f79c4..1757bfa 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -47,7 +47,9 @@ install_theme_deps() { elif has_command xbps-install; then # Rolling release # 'xbps-install' requires 'xbps' to be always up-to-date - rootify xbps-install -Syu xbps sassc glib-devel gtk-engine-murrine libxml2 + # 'libxml2' is already included here, and it's gonna broke the + # installation if you add it + rootify xbps-install -Syu xbps sassc glib-devel gtk-engine-murrine # 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 rootify vkpurge rm all @@ -80,7 +82,9 @@ install_gdm_deps() { elif has_command xbps-install; then # Rolling release # 'xbps-install' requires 'xbps' to be always up-to-date - rootify xbps-install -Syu xbps glib-devel libxml2 sassc + # 'libxml2' is already included here, and it's gonna broke the + # installation if you add it + rootify xbps-install -Syu xbps glib-devel sassc # 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 rootify vkpurge rm all @@ -681,6 +685,8 @@ customize_theme() { # values are taken from _variables.scss show_panel_opacity_dialog() { + install_dialog_deps + if [[ -x /usr/bin/dialog ]]; then tui=$(dialog --backtitle "${THEME_NAME} gtk theme installer" \ --radiolist "Choose your panel background opacity @@ -704,6 +710,8 @@ show_panel_opacity_dialog() { } show_sidebar_size_dialog() { + install_dialog_deps + 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 \ @@ -726,6 +734,8 @@ show_sidebar_size_dialog() { } show_nautilus_style_dialog() { + install_dialog_deps + 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 \ @@ -746,8 +756,6 @@ show_nautilus_style_dialog() { } 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 From eb542ecd78357803075a90a08711d540b0490fc5 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Tue, 8 Jun 2021 06:08:06 +0700 Subject: [PATCH 04/40] Add Clear Linux support --- install.sh | 1 + lib-install.sh | 58 ++++++++++++-------------------------------------- tweaks.sh | 2 +- 3 files changed, 16 insertions(+), 45 deletions(-) diff --git a/install.sh b/install.sh index 0ded2f0..15e9ef9 100755 --- a/install.sh +++ b/install.sh @@ -120,6 +120,7 @@ else install_theme_deps; echo if [[ "${interactive}" == 'true' ]]; then + install_dialog_deps show_panel_opacity_dialog; show_sidebar_size_dialog; show_nautilus_style_dialog prompt -w "DIALOG: '--size' and '--panel' parameters are ignored if exist."; echo else diff --git a/lib-install.sh b/lib-install.sh index 1757bfa..f357961 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -20,7 +20,7 @@ WHITESUR_SOURCE+=("lib-install.sh") 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." + prompt -w "\n'glib2.0', 'sassc', 'xmllint', and 'libmurrine' are required for theme installation.\n" # Be careful of some distro mechanism, some of them use rolling-release # based installation instead of point-release, e.g., Arch Linux @@ -35,6 +35,9 @@ install_theme_deps() { if has_command zypper; then rootify zypper in -y sassc glib2-devel gtk2-engine-murrine libxml2-tools + elif has_command swupd; then + # Rolling release + rootify swupd update && rootify swupd bundle-add desktop-dev devpkg-gtk libxml2 elif has_command apt; then rootify apt install -y sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils elif has_command dnf; then @@ -62,47 +65,15 @@ install_theme_deps() { fi } -install_gdm_deps() { - #TODO: @vince, do we also need "sassc" here? - - 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." - - if has_command zypper; then - rootify zypper in -y glib2-devel libxml2-tools sassc - elif has_command apt; then - rootify apt install -y libglib2.0-dev-bin libxml2-utils sassc - elif has_command dnf; then - rootify dnf install -y glib2-devel libxml2 sassc - elif has_command yum; then - rootify yum install -y glib2-devel libxml2 sassc - elif has_command pacman; then - # Rolling release - rootify pacman -Syu --noconfirm --needed glib2 libxml2 sassc - elif has_command xbps-install; then - # Rolling release - # 'xbps-install' requires 'xbps' to be always up-to-date - # 'libxml2' is already included here, and it's gonna broke the - # installation if you add it - rootify xbps-install -Syu xbps glib-devel sassc - # 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 - rootify vkpurge rm all - 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 - fi -} - install_beggy_deps() { if ! has_command convert; then - echo; prompt -w "'imagemagick' are required for background editing." + prompt -w "\n'imagemagick' are required for background editing.\n" if has_command zypper; then rootify zypper in -y ImageMagick + elif has_command swupd; then + # Rolling release + rootify swupd update && rootify swupd bundle-add ImageMagick elif has_command apt; then rootify apt install -y imagemagick elif has_command dnf; then @@ -130,10 +101,13 @@ install_beggy_deps() { install_dialog_deps() { if ! has_command dialog; then - echo; prompt -w "'dialog' are required for this option." + prompt -w "\n'dialog' is required for this option.\n" if has_command zypper; then rootify zypper in -y dialog + elif has_command swupd; then + # Rolling release + rootify swupd update && rootify swupd bundle-add alsa-utils elif has_command apt; then rootify apt install -y dialog elif has_command dnf; then @@ -685,8 +659,6 @@ customize_theme() { # values are taken from _variables.scss show_panel_opacity_dialog() { - install_dialog_deps - if [[ -x /usr/bin/dialog ]]; then tui=$(dialog --backtitle "${THEME_NAME} gtk theme installer" \ --radiolist "Choose your panel background opacity @@ -710,8 +682,6 @@ show_panel_opacity_dialog() { } show_sidebar_size_dialog() { - install_dialog_deps - 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 \ @@ -734,8 +704,6 @@ show_sidebar_size_dialog() { } show_nautilus_style_dialog() { - install_dialog_deps - 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 \ @@ -756,6 +724,8 @@ show_nautilus_style_dialog() { } 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/tweaks.sh b/tweaks.sh index cf4caa8..03a5fbb 100755 --- a/tweaks.sh +++ b/tweaks.sh @@ -173,7 +173,7 @@ else if [[ "${gdm}" == 'true' ]]; then echo; prompt -i "Installing '${name}' GDM theme..." - install_gdm_deps; install_gdm_theme + install_theme_deps; install_gdm_theme echo; prompt -s "Done! '${name}' GDM theme has been installed." fi From 8cf73bb42a1ee84ebf9cc55e05ffa08f6e87f926 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Tue, 8 Jun 2021 09:53:53 +0700 Subject: [PATCH 05/40] Add Clear Linux support --- lib-core.sh | 21 +++++++++++++++---- lib-install.sh | 57 ++++++++++++++++++++++++++++++++------------------ 2 files changed, 54 insertions(+), 24 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index 69f39ea..3be6ca1 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -56,7 +56,7 @@ 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" @@ -227,7 +227,9 @@ operation_aborted() { 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 "=========== ERROR LOG ===========" @@ -253,7 +255,7 @@ 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" @@ -286,6 +288,17 @@ userify() { trap signal_exit SIGINT } +write_as_root() { + trap true SIGINT + + if ! echo "${1}" | sudo tee "${2}" > /dev/null; then + error_snippet="${*}" + operation_aborted + fi + + trap signal_exit SIGINT +} + trap 'operation_aborted' ERR trap 'signal_exit' INT EXIT TERM @@ -588,7 +601,7 @@ remind_relative_path() { ############################################################################### full_rootify() { - if [[ ! -w "/" ]]; then + if [[ ! -w "/root" ]]; then prompt -e "ERROR: '${1}' needs a root priviledge. Please run this '${0}' as root" has_any_error="true" fi diff --git a/lib-install.sh b/lib-install.sh index f357961..f9ae1be 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -17,6 +17,35 @@ WHITESUR_SOURCE+=("lib-install.sh") # DEPENDENCIES # ############################################################################### +prepare_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) + + local repo=" + [clearlinux] + name=clearlinux + baseurl=https://download.clearlinux.org/current/x86_64/os/ + gpgcheck=0" + + rootify swupd update && rootify swupd bundle-add dnf + + if [[ ! -d "/etc/yum.repos.d" ]]; then + rootify mkdir -p "/etc/yum.repos.d" + write_as_root "${repo}" "/etc/yum.repos.d/clearlinux.repo" + fi + + rootify dnf upgrade +} + +prepare_xbps() { + # 'xbps-install' requires 'xbps' to be always up-to-date + rootify 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 + rootify vkpurge rm all +} + install_theme_deps() { if ! has_command glib-compile-resources || ! has_command sassc || \ ! has_command xmllint || [[ ! -r "/usr/share/gtk-engines/murrine.xml" ]]; then @@ -37,7 +66,7 @@ install_theme_deps() { rootify zypper in -y sassc glib2-devel gtk2-engine-murrine libxml2-tools elif has_command swupd; then # Rolling release - rootify swupd update && rootify swupd bundle-add desktop-dev devpkg-gtk libxml2 + prepare_swupd && rootify dnf install -y sassc glib-dev gtk-xfce-engine libxml2 elif has_command apt; then rootify apt install -y sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils elif has_command dnf; then @@ -49,13 +78,9 @@ install_theme_deps() { rootify pacman -Syu --noconfirm --needed sassc glib2 gtk-engine-murrine libxml2 elif has_command xbps-install; then # Rolling release - # 'xbps-install' requires 'xbps' to be always up-to-date - # 'libxml2' is already included here, and it's gonna broke the - # installation if you add it - rootify xbps-install -Syu xbps sassc glib-devel gtk-engine-murrine - # 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 - rootify vkpurge rm all + # 'libxml2' is already included here, and it's gonna broke the installation + # if you add it + prepare_xbps && rootify xbps-install -Sy sassc glib-devel gtk-engine-murrine 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" @@ -73,7 +98,7 @@ install_beggy_deps() { rootify zypper in -y ImageMagick elif has_command swupd; then # Rolling release - rootify swupd update && rootify swupd bundle-add ImageMagick + prepare_swupd && rootify dnf install -y ImageMagick elif has_command apt; then rootify apt install -y imagemagick elif has_command dnf; then @@ -85,11 +110,7 @@ install_beggy_deps() { rootify pacman -Syu --noconfirm --needed imagemagick elif has_command xbps-install; then # Rolling release - # 'xbps-install' requires 'xbps' to be always up-to-date - rootify xbps-install -Syu xbps ImageMagick - # 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 - rootify vkpurge rm all + prepare_xbps && rootify 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" @@ -107,7 +128,7 @@ install_dialog_deps() { rootify zypper in -y dialog elif has_command swupd; then # Rolling release - rootify swupd update && rootify swupd bundle-add alsa-utils + prepare_swupd && rootify dnf install -y dialog elif has_command apt; then rootify apt install -y dialog elif has_command dnf; then @@ -119,11 +140,7 @@ install_dialog_deps() { rootify pacman -Syu --noconfirm --needed dialog elif has_command xbps-install; then # Rolling release - # 'xbps-install' requires 'xbps' to be always up-to-date - rootify xbps-install -Syu xbps dialog - # 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 - rootify vkpurge rm all + prepare_xbps && rootify 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" From fcf64958497bdcaed348c8b10310cf9fb203b92b Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Tue, 8 Jun 2021 10:43:47 +0700 Subject: [PATCH 06/40] Add Clear Linux support --- lib-install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib-install.sh b/lib-install.sh index f9ae1be..93cd439 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -47,8 +47,8 @@ prepare_xbps() { } install_theme_deps() { - if ! has_command glib-compile-resources || ! has_command sassc || \ - ! has_command xmllint || [[ ! -r "/usr/share/gtk-engines/murrine.xml" ]]; then + if ! has_command glib-compile-resources || ! has_command sassc || ! has_command xmllint || + (! is_my_distro "clear-linux" && [[ ! -r "/usr/share/gtk-engines/murrine.xml" ]]); then prompt -w "\n'glib2.0', 'sassc', 'xmllint', and 'libmurrine' are required for theme installation.\n" # Be careful of some distro mechanism, some of them use rolling-release @@ -66,7 +66,7 @@ install_theme_deps() { rootify zypper in -y sassc glib2-devel gtk2-engine-murrine libxml2-tools elif has_command swupd; then # Rolling release - prepare_swupd && rootify dnf install -y sassc glib-dev gtk-xfce-engine libxml2 + prepare_swupd && rootify dnf install -y sassc glib-bin libxml2-bin elif has_command apt; then rootify apt install -y sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils elif has_command dnf; then From 34f55e206a2dddf73ccc776c750842a807bf0ebf Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Tue, 8 Jun 2021 15:36:57 +0700 Subject: [PATCH 07/40] Add Clear Linux support --- lib-core.sh | 13 ++++++++++++- lib-install.sh | 45 +++++++++++++++++++++++---------------------- 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index 3be6ca1..ad9b9f4 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -291,7 +291,18 @@ userify() { write_as_root() { trap true SIGINT - if ! echo "${1}" | sudo tee "${2}" > /dev/null; then + if ! echo -e "${1}" | sudo tee "${2}" > /dev/null; then + error_snippet="${*}" + operation_aborted + fi + + trap signal_exit SIGINT +} + +write_as_user() { + trap true SIGINT + + if ! echo -e "${1}" | sudo -u "${MY_USERNAME}" tee "${2}" > /dev/null; then error_snippet="${*}" operation_aborted fi diff --git a/lib-install.sh b/lib-install.sh index 93cd439..be8b671 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -22,20 +22,20 @@ prepare_swupd() { # for installing a util, e.g. 'sassc' (from 'desktop-dev' bundle, or # 'os-utils-gui-dev' bundle, or any other 'sassc' provider bundle) - local repo=" - [clearlinux] - name=clearlinux - baseurl=https://download.clearlinux.org/current/x86_64/os/ - gpgcheck=0" + local repo="[clearlinux]\nname=Clear Linux\nbaseurl=https://download.clearlinux.org/current/x86_64/os/\ngpgcheck=0" - rootify swupd update && rootify swupd bundle-add dnf + rootify swupd update && rootify swupd bundle-add -y dnf if [[ ! -d "/etc/yum.repos.d" ]]; then rootify mkdir -p "/etc/yum.repos.d" write_as_root "${repo}" "/etc/yum.repos.d/clearlinux.repo" fi - rootify dnf upgrade + backup_file "/etc/os-release" "rootify"; rootify dnf upgrade +} + +finalize_swupd() { + restore_file "/etc/os-release" "rootify" } prepare_xbps() { @@ -66,7 +66,7 @@ install_theme_deps() { rootify zypper in -y sassc glib2-devel gtk2-engine-murrine libxml2-tools elif has_command swupd; then # Rolling release - prepare_swupd && rootify dnf install -y sassc glib-bin libxml2-bin + prepare_swupd && rootify dnf install -y sassc glib-bin libxml2-bin && finalize_swupd elif has_command apt; then rootify apt install -y sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils elif has_command dnf; then @@ -98,7 +98,7 @@ install_beggy_deps() { rootify zypper in -y ImageMagick elif has_command swupd; then # Rolling release - prepare_swupd && rootify dnf install -y ImageMagick + prepare_swupd && rootify dnf install -y ImageMagick && finalize_swupd elif has_command apt; then rootify apt install -y imagemagick elif has_command dnf; then @@ -128,7 +128,7 @@ install_dialog_deps() { rootify zypper in -y dialog elif has_command swupd; then # Rolling release - prepare_swupd && rootify dnf install -y dialog + prepare_swupd && rootify dnf install -y dialog && finalize_swupd elif has_command apt; then rootify apt install -y dialog elif has_command dnf; then @@ -278,19 +278,20 @@ 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" + 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 "${desktop_entry}" > "${TARGET_DIR}/index.theme" #--------------------GTK-3.0--------------------# From 63656bf788495b6bd8efcd1f7f325004dde10da9 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Tue, 8 Jun 2021 17:19:57 +0700 Subject: [PATCH 08/40] Add Clear Linux support --- lib-install.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib-install.sh b/lib-install.sh index be8b671..0dbd960 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -24,14 +24,15 @@ prepare_swupd() { local repo="[clearlinux]\nname=Clear Linux\nbaseurl=https://download.clearlinux.org/current/x86_64/os/\ngpgcheck=0" - rootify swupd update && rootify swupd bundle-add -y dnf + rootify swupd update && backup_file "/etc/os-release" "rootify" + rootify swupd bundle-add -y dnf if [[ ! -d "/etc/yum.repos.d" ]]; then rootify mkdir -p "/etc/yum.repos.d" write_as_root "${repo}" "/etc/yum.repos.d/clearlinux.repo" fi - backup_file "/etc/os-release" "rootify"; rootify dnf upgrade + rootify dnf upgrade } finalize_swupd() { @@ -176,7 +177,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 @@ -420,7 +423,6 @@ remove_themes() { } install_gdm_theme() { - start_animation local TARGET= # Let's go! @@ -461,8 +463,6 @@ install_gdm_theme() { # Fix previously installed WhiteSur restore_file "${ETC_GR_FILE}" fi - - stop_animation } revert_gdm_theme() { From 04de695c350f708650a4ecff005e910c6e32194b Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Tue, 8 Jun 2021 19:07:33 +0700 Subject: [PATCH 09/40] Add Clear Linux support --- lib-core.sh | 2 +- lib-install.sh | 24 +++++++++--------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index ad9b9f4..cc6f668 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -217,7 +217,7 @@ signal_exit() { operation_aborted() { IFS=$'\n' local sources=($(basename -a "${WHITESUR_SOURCE[@]}" "${BASH_SOURCE[@]}" | sort -u)) - local dist_ids=($(awk -F '=' '/ID/{print $2}' "/etc/os-release" | sort -u)) + local dist_ids=($(awk -F '=' '/ID/{print $2}' "/etc/os-release" | sort -Vru)) local repo_ver="" local lines=() diff --git a/lib-install.sh b/lib-install.sh index 0dbd960..2cceb89 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -22,21 +22,15 @@ prepare_swupd() { # for installing a util, e.g. 'sassc' (from 'desktop-dev' bundle, or # 'os-utils-gui-dev' bundle, or any other 'sassc' provider bundle) - local repo="[clearlinux]\nname=Clear Linux\nbaseurl=https://download.clearlinux.org/current/x86_64/os/\ngpgcheck=0" + local ver="$(wget -qO- "https://cdn.download.clearlinux.org/latest")" + local conf="[clear]\nname=Clear\nbaseurl=https://cdn.download.clearlinux.org/releases/${ver}/clear/x86_64/os/\ngpgcheck=0" - rootify swupd update && backup_file "/etc/os-release" "rootify" - rootify swupd bundle-add -y dnf + rootify swupd update -y && rootify swupd bundle-add -y dnf - if [[ ! -d "/etc/yum.repos.d" ]]; then - rootify mkdir -p "/etc/yum.repos.d" - write_as_root "${repo}" "/etc/yum.repos.d/clearlinux.repo" - fi + rootify mkdir -p "/etc/dnf" + write_as_root "${conf}" "/etc/dnf/dnf.conf" - rootify dnf upgrade -} - -finalize_swupd() { - restore_file "/etc/os-release" "rootify" + rootify rpm --initdb && rootify dnf upgrade } prepare_xbps() { @@ -67,7 +61,7 @@ install_theme_deps() { rootify zypper in -y sassc glib2-devel gtk2-engine-murrine libxml2-tools elif has_command swupd; then # Rolling release - prepare_swupd && rootify dnf install -y sassc glib-bin libxml2-bin && finalize_swupd + prepare_swupd && rootify dnf install -y sassc glib-bin libxml2-bin elif has_command apt; then rootify apt install -y sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils elif has_command dnf; then @@ -99,7 +93,7 @@ install_beggy_deps() { rootify zypper in -y ImageMagick elif has_command swupd; then # Rolling release - prepare_swupd && rootify dnf install -y ImageMagick && finalize_swupd + prepare_swupd && rootify dnf install -y ImageMagick elif has_command apt; then rootify apt install -y imagemagick elif has_command dnf; then @@ -129,7 +123,7 @@ install_dialog_deps() { rootify zypper in -y dialog elif has_command swupd; then # Rolling release - prepare_swupd && rootify dnf install -y dialog && finalize_swupd + prepare_swupd && rootify dnf install -y dialog elif has_command apt; then rootify apt install -y dialog elif has_command dnf; then From 99d5b82bc09e25ee560c107db61375e577fb097f Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Tue, 8 Jun 2021 21:03:41 +0700 Subject: [PATCH 10/40] Add Clear Linux support --- README.md | 2 +- lib-install.sh | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index ac38144..2043b68 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ - gtk2-engines-murrine `Ubuntu/Mint/Debian` - gtk-engine-murrine `Arch/Manjaro` -### 'Install from source' deps +### "Install from source" deps - sassc - libglib2.0-dev-bin `ubuntu 20.04` - libglib2.0-dev `ubuntu 18.04` `debian 10.03` `linux mint 19` diff --git a/lib-install.sh b/lib-install.sh index 2cceb89..2d89920 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -17,20 +17,29 @@ WHITESUR_SOURCE+=("lib-install.sh") # DEPENDENCIES # ############################################################################### +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_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) + rootify swupd update -y && rootify swupd bundle-add -y dnf wget + local ver="$(wget -qO- "https://cdn.download.clearlinux.org/latest")" local conf="[clear]\nname=Clear\nbaseurl=https://cdn.download.clearlinux.org/releases/${ver}/clear/x86_64/os/\ngpgcheck=0" - - rootify swupd update -y && rootify swupd bundle-add -y dnf + local 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}" rootify mkdir -p "/etc/dnf" write_as_root "${conf}" "/etc/dnf/dnf.conf" - rootify rpm --initdb && rootify dnf upgrade + write_as_root "${dist}" "/etc/os-release" } prepare_xbps() { @@ -77,10 +86,7 @@ install_theme_deps() { # if you add it prepare_xbps && rootify xbps-install -Sy sassc glib-devel gtk-engine-murrine 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 } @@ -107,10 +113,7 @@ install_beggy_deps() { # Rolling release prepare_xbps && rootify 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 } @@ -137,10 +140,7 @@ install_dialog_deps() { # Rolling release prepare_xbps && rootify 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 } From 9597331eac682bbfac6d9dd606c07122d3b628c1 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Wed, 9 Jun 2021 08:14:30 +0700 Subject: [PATCH 11/40] Add Clear Linux support --- lib-core.sh | 38 +++++---------- lib-install.sh | 82 ++++++++++++++++++++++---------- src/other/firefox/userChrome.css | 2 +- 3 files changed, 70 insertions(+), 52 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index cc6f668..7534e5d 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -128,6 +128,8 @@ process_ids=() error_snippet="" export ANIM_PID="0" has_any_error="false" +swupd_packages="" +swupd_url="https://cdn.download.clearlinux.org/current/x86_64/os/Packages" # Colors and animation c_default="\033[0m" @@ -266,48 +268,34 @@ operation_aborted() { } rootify() { + local result=0 + trap true SIGINT prompt -w "Executing '$(echo "${@}" | cut -c -35 )...' as root" - if ! sudo "${@}"; then + if [[ -p /dev/stdin ]] && ! sudo "${@}" < /dev/stdin || ! sudo "${@}"; then error_snippet="${*}" - operation_aborted + result=1 fi trap signal_exit SIGINT + + return "${result}" } userify() { + local result=0 + trap true SIGINT - if ! sudo -u "${MY_USERNAME}" "${@}"; then + if [[ -p /dev/stdin ]] && ! sudo -u "${MY_USERNAME}" "${@}" < /dev/stdin || ! sudo -u "${MY_USERNAME}" "${@}"; then error_snippet="${*}" - operation_aborted + result=1 fi trap signal_exit SIGINT -} -write_as_root() { - trap true SIGINT - - if ! echo -e "${1}" | sudo tee "${2}" > /dev/null; then - error_snippet="${*}" - operation_aborted - fi - - trap signal_exit SIGINT -} - -write_as_user() { - trap true SIGINT - - if ! echo -e "${1}" | sudo -u "${MY_USERNAME}" tee "${2}" > /dev/null; then - error_snippet="${*}" - operation_aborted - fi - - trap signal_exit SIGINT + return "${result}" } trap 'operation_aborted' ERR diff --git a/lib-install.sh b/lib-install.sh index 2d89920..9a839e6 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -17,6 +17,24 @@ WHITESUR_SOURCE+=("lib-install.sh") # DEPENDENCIES # ############################################################################### +# Be careful of some distro mechanism, some of them use rolling-release +# based installation instead of point-release, 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. + +# 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 don't use 'dnf' + 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" @@ -25,21 +43,44 @@ installation_sorry() { } prepare_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) + local remove="" + local ver="" + local conf="" + local dist="" - rootify swupd update -y && rootify swupd bundle-add -y dnf wget + 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\n" - local ver="$(wget -qO- "https://cdn.download.clearlinux.org/latest")" - local conf="[clear]\nname=Clear\nbaseurl=https://cdn.download.clearlinux.org/releases/${ver}/clear/x86_64/os/\ngpgcheck=0" - local 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}" + while [[ "${remove}" != "y" && "${remove}" != "n" ]]; do + read -p "You wanna remove it? (y/n): " remove + done + fi - rootify mkdir -p "/etc/dnf" - write_as_root "${conf}" "/etc/dnf/dnf.conf" - rootify rpm --initdb && rootify dnf upgrade - write_as_root "${dist}" "/etc/os-release" + if ! rootify swupd update -y; then + ver="$(curl -s "https://cdn.download.clearlinux.org/latest")" + 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}" + + print -w "CLEAR LINUX: Your 'swupd' is broken\n" + print -i "CLEAR LINUX: Patching 'swupd' distro version detection and try again...\n" + echo -e "${dist}" | rootify tee "/etc/os-release" > /dev/null + + rootify swupd update -y + fi + + [[ "${remove}" == "y" ]] && rootify swupd bundle-remove -y dnf +} + +install_swupd_packages() { + if [[ ! "${swupd_packages}" ]]; then + swupd_packages="$(curl -s "${swupd_url}" | awk -F '"' '/-bin-|-lib-/{print $2}')" + fi + + for key in "${@}"; do + for pkg in $(echo "${swupd_packages}" | grep -F "${key}"); do + curl "${swupd_url}/${pkg}" -o - | rootify bsdtar -xf - -C "/" + done + done } prepare_xbps() { @@ -55,22 +96,11 @@ install_theme_deps() { (! is_my_distro "clear-linux" && [[ ! -r "/usr/share/gtk-engines/murrine.xml" ]]); then prompt -w "\n'glib2.0', 'sassc', 'xmllint', and 'libmurrine' are required for theme installation.\n" - # Be careful of some distro mechanism, some of them use rolling-release - # based installation instead of point-release, 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. - - # That's why we need a full system upgrade here - if has_command zypper; then rootify zypper in -y sassc glib2-devel gtk2-engine-murrine libxml2-tools elif has_command swupd; then # Rolling release - prepare_swupd && rootify dnf install -y sassc glib-bin libxml2-bin + prepare_swupd && rootify swupd bundle-add libglib libxml2 && install_swupd_packages sassc elif has_command apt; then rootify apt install -y sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils elif has_command dnf; then @@ -99,7 +129,7 @@ install_beggy_deps() { rootify zypper in -y ImageMagick elif has_command swupd; then # Rolling release - prepare_swupd && rootify dnf install -y ImageMagick + prepare_swupd && rootify swupd bundle-add ImageMagick elif has_command apt; then rootify apt install -y imagemagick elif has_command dnf; then @@ -126,7 +156,7 @@ install_dialog_deps() { rootify zypper in -y dialog elif has_command swupd; then # Rolling release - prepare_swupd && rootify dnf install -y dialog + prepare_swupd && install_swupd_packages dialog elif has_command apt; then rootify apt install -y dialog elif has_command dnf; then 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] From 238178e3032c6c5a9fa7df7093d96693d6b00aaf Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Wed, 9 Jun 2021 16:48:52 +0700 Subject: [PATCH 12/40] Add Clear Linux support --- lib-core.sh | 8 ++++++-- lib-install.sh | 10 +++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index 7534e5d..1acf620 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -129,7 +129,9 @@ error_snippet="" export ANIM_PID="0" has_any_error="false" swupd_packages="" -swupd_url="https://cdn.download.clearlinux.org/current/x86_64/os/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" # Colors and animation c_default="\033[0m" @@ -217,6 +219,8 @@ signal_exit() { } operation_aborted() { + # 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" | sort -Vru)) @@ -236,7 +240,7 @@ operation_aborted() { prompt -e "\n\n Oops! Operation has been aborted or failed...\n" prompt -e "=========== ERROR LOG ===========" - if ! awk '{printf "\033[1;31m >>> %s\n", $0}' "${WHITESUR_TMP_DIR}/error_log.txt"; then + if [[ "$(awk '{printf "\033[1;31m >>> %s\n", $0}' "${WHITESUR_TMP_DIR}/error_log.txt" || echo "")" == "" ]] ; then prompt -e ">>>>>>> No error log found <<<<<<" fi diff --git a/lib-install.sh b/lib-install.sh index 9a839e6..8926254 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -57,7 +57,7 @@ prepare_swupd() { fi if ! rootify swupd update -y; then - ver="$(curl -s "https://cdn.download.clearlinux.org/latest")" + 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}" @@ -68,17 +68,17 @@ prepare_swupd() { rootify swupd update -y fi - [[ "${remove}" == "y" ]] && rootify swupd bundle-remove -y dnf + if [[ "${remove}" == "y" ]]; then rootify swupd bundle-remove -y dnf; fi } install_swupd_packages() { if [[ ! "${swupd_packages}" ]]; then - swupd_packages="$(curl -s "${swupd_url}" | awk -F '"' '/-bin-|-lib-/{print $2}')" + 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 "${swupd_url}/${pkg}" -o - | rootify bsdtar -xf - -C "/" + curl -s -o - "${swupd_url}/${pkg}" | rootify bsdtar -xf - -C "/" done done } @@ -100,7 +100,7 @@ install_theme_deps() { rootify zypper in -y sassc glib2-devel gtk2-engine-murrine libxml2-tools elif has_command swupd; then # Rolling release - prepare_swupd && rootify swupd bundle-add libglib libxml2 && install_swupd_packages sassc + prepare_swupd && rootify swupd bundle-add libglib libxml2 && install_swupd_packages sassc libsass elif has_command apt; then rootify apt install -y sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils elif has_command dnf; then From d24df87d7b45d05195b8e60ddcaedc11ed59d952 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Wed, 9 Jun 2021 21:15:05 +0700 Subject: [PATCH 13/40] Add Clear Linux support --- .github/CONTRIBUTING.md | 11 ++++++++++- README.md | 2 +- lib-core.sh | 5 ++++- lib-install.sh | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 5b6b4f5..ef54c61 100644 --- a/.github/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/README.md b/README.md index 2043b68..1904122 100644 --- a/README.md +++ b/README.md @@ -331,4 +331,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/lib-core.sh b/lib-core.sh index 1acf620..62c8310 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -226,6 +226,7 @@ operation_aborted() { local dist_ids=($(awk -F '=' '/ID/{print $2}' "/etc/os-release" | 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="$(date -r "${REPO_DIR}" +"%FT%T%z")"; then @@ -240,7 +241,9 @@ operation_aborted() { prompt -e "\n\n Oops! Operation has been aborted or failed...\n" prompt -e "=========== ERROR LOG ===========" - if [[ "$(awk '{printf "\033[1;31m >>> %s\n", $0}' "${WHITESUR_TMP_DIR}/error_log.txt" || echo "")" == "" ]] ; then + echo -e "${log}" + + if [[ ! "${log}" ]] ; then prompt -e ">>>>>>> No error log found <<<<<<" fi diff --git a/lib-install.sh b/lib-install.sh index 8926254..ab2f600 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -52,7 +52,7 @@ prepare_swupd() { prompt -w "CLEAR LINUX: You have 'dnf' installed in your system. It may break your system especially when you remove a package\n" while [[ "${remove}" != "y" && "${remove}" != "n" ]]; do - read -p "You wanna remove it? (y/n): " remove + read -p "${c_cyan}You wanna remove it? (y/n): ${c_green}" remove 2>&1 done fi From 09d7d2953e7daff9fbe3f8a4ab1a8803d9eef39b Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Wed, 9 Jun 2021 23:00:46 +0700 Subject: [PATCH 14/40] Add Clear Linux support --- lib-core.sh | 15 ++++++++------- lib-install.sh | 17 ++++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index 62c8310..e7d709e 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -125,7 +125,6 @@ msg="" final_msg="Run '${0} --help' to explore more customization features!" notif_msg="" process_ids=() -error_snippet="" export ANIM_PID="0" has_any_error="false" swupd_packages="" @@ -251,11 +250,11 @@ operation_aborted() { 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 "${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 >>> ${BASH_COMMAND}" prompt -e "TRACE :" for i in "${FUNCNAME[@]}"; do @@ -280,8 +279,9 @@ rootify() { trap true SIGINT prompt -w "Executing '$(echo "${@}" | cut -c -35 )...' as root" - if [[ -p /dev/stdin ]] && ! sudo "${@}" < /dev/stdin || ! sudo "${@}"; then - error_snippet="${*}" + if [[ -p /dev/stdin ]] && ! sudo "${@}" < /dev/stdin; then + result=1 + elif ! sudo "${@}"; then result=1 fi @@ -295,8 +295,9 @@ userify() { trap true SIGINT - if [[ -p /dev/stdin ]] && ! sudo -u "${MY_USERNAME}" "${@}" < /dev/stdin || ! sudo -u "${MY_USERNAME}" "${@}"; then - error_snippet="${*}" + if [[ -p /dev/stdin ]] && ! sudo -u "${MY_USERNAME}" "${@}" < /dev/stdin; then + result=1 + elif ! sudo -u "${MY_USERNAME}" "${@}"; then result=1 fi diff --git a/lib-install.sh b/lib-install.sh index ab2f600..28125b0 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -33,7 +33,7 @@ WHITESUR_SOURCE+=("lib-install.sh") # 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 don't use 'dnf' +# Manual package installation is needed for that, but please don't use 'dnf' installation_sorry() { prompt -w "WARNING: We're sorry, your distro isn't officially supported yet." @@ -49,10 +49,12 @@ prepare_swupd() { 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\n" + prompt -w "CLEAR LINUX: You have 'dnf' installed in your system. It may break your system especially when you remove a package" while [[ "${remove}" != "y" && "${remove}" != "n" ]]; do - read -p "${c_cyan}You wanna remove it? (y/n): ${c_green}" remove 2>&1 + echo -e "${c_green}" + read -p "You wanna remove it? (y/n): " remove 2>&1 + echo -e "${c_default}" done fi @@ -68,6 +70,7 @@ prepare_swupd() { rootify swupd update -y fi + if ! has_command bsdtar; then rootify swupd bundle-add libarchive; fi if [[ "${remove}" == "y" ]]; then rootify swupd bundle-remove -y dnf; fi } @@ -94,7 +97,7 @@ prepare_xbps() { install_theme_deps() { if ! has_command glib-compile-resources || ! has_command sassc || ! has_command xmllint || (! is_my_distro "clear-linux" && [[ ! -r "/usr/share/gtk-engines/murrine.xml" ]]); then - prompt -w "\n'glib2.0', 'sassc', 'xmllint', and 'libmurrine' are required for theme installation.\n" + prompt -w "\n 'glib2.0', 'sassc', 'xmllint', and 'libmurrine' are required for theme installation.\n" if has_command zypper; then rootify zypper in -y sassc glib2-devel gtk2-engine-murrine libxml2-tools @@ -123,7 +126,7 @@ install_theme_deps() { install_beggy_deps() { if ! has_command convert; then - prompt -w "\n'imagemagick' are required for background editing.\n" + prompt -w "\n 'imagemagick' are required for background editing.\n" if has_command zypper; then rootify zypper in -y ImageMagick @@ -150,7 +153,7 @@ install_beggy_deps() { install_dialog_deps() { if ! has_command dialog; then - prompt -w "\n'dialog' is required for this option.\n" + prompt -w "\n 'dialog' is required for this option.\n" if has_command zypper; then rootify zypper in -y dialog @@ -319,7 +322,7 @@ install_theemy() { desktop_entry+="CursorTheme=WhiteSur-cursors\n" desktop_entry+="ButtonLayout=close,minimize,maximize:menu\n" - echo "${desktop_entry}" > "${TARGET_DIR}/index.theme" + echo -e "${desktop_entry}" > "${TARGET_DIR}/index.theme" #--------------------GTK-3.0--------------------# From 024815263d27150f24e840bf362d3841ac5d1e18 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Wed, 9 Jun 2021 23:53:49 +0700 Subject: [PATCH 15/40] Add Clear Linux support --- lib-core.sh | 45 ++++++++++++++++++++++++++------------------- lib-install.sh | 13 +++++++------ 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index e7d709e..d08537e 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -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,7 @@ else SED_OPT="-i" fi -# Directories +#------------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" @@ -62,7 +62,7 @@ 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 +74,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 +85,7 @@ SIDEBAR_SIZE_VARIANTS=('default' '220' '240' '260' '280') PANEL_OPACITY_VARIANTS=('default' '30' '45' '60' '75') NAUTILUS_STYLE_VARIANTS=('default' 'stable' 'mojave' 'glassy') -# Customization, default values +#--------Customization, default values----------# dest="${THEME_DIR}" name="${THEME_NAME}" colors=("${COLOR_VARIANTS}") @@ -99,11 +99,11 @@ nautilus_style="${NAUTILUS_STYLE_VARIANTS[1]}" 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" @@ -120,11 +120,14 @@ 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=() +# This is important for 'rootify' and 'userify' because 'return "${result}"' is +# considered the last command in 'BASH_COMMAND' variable +error_snippet="" export ANIM_PID="0" has_any_error="false" swupd_packages="" @@ -132,7 +135,7 @@ swupd_packages="" swupd_url="https://cdn.download.clearlinux.org/current/x86_64/os/Packages/" swupd_ver_url="https://cdn.download.clearlinux.org/latest" -# Colors and animation +#------Colors and animation--------# c_default="\033[0m" c_blue="\033[1;34m" c_magenta="\033[1;35m" @@ -250,11 +253,11 @@ operation_aborted() { prompt -e "FOUND :" for i in "${sources[@]}"; do - lines=($(grep -Fn "${BASH_COMMAND}" "${REPO_DIR}/${i}" | cut -d : -f 1 || echo "")) + lines=($(grep -Fn "${error_snippet:-${BASH_COMMAND}}" "${REPO_DIR}/${i}" | cut -d : -f 1 || echo "")) prompt -e " >>> ${i}$(IFS=';'; [[ "${lines[*]}" ]] && echo " at ${lines[*]}")" done - prompt -e "SNIPPET:\n >>> ${BASH_COMMAND}" + prompt -e "SNIPPET:\n >>> ${error_snippet:-${BASH_COMMAND}}" prompt -e "TRACE :" for i in "${FUNCNAME[@]}"; do @@ -279,10 +282,12 @@ rootify() { trap true SIGINT prompt -w "Executing '$(echo "${@}" | cut -c -35 )...' as root" - if [[ -p /dev/stdin ]] && ! sudo "${@}" < /dev/stdin; then - result=1 - elif ! sudo "${@}"; then - result=1 + if [[ -p /dev/stdin ]]; then + ! sudo "${@}" < /dev/stdin && result=1 + error_snippet="${*}" + else + ! sudo "${@}" && result=1 + error_snippet="${*}" fi trap signal_exit SIGINT @@ -295,10 +300,12 @@ userify() { trap true SIGINT - if [[ -p /dev/stdin ]] && ! sudo -u "${MY_USERNAME}" "${@}" < /dev/stdin; then - result=1 - elif ! sudo -u "${MY_USERNAME}" "${@}"; then - result=1 + if [[ -p /dev/stdin ]]; then + ! sudo -u "${MY_USERNAME}" "${@}" < /dev/stdin && result=1 + error_snippet="${*}" + else + ! sudo -u "${MY_USERNAME}" "${@}" && result=1 + error_snippet="${*}" fi trap signal_exit SIGINT diff --git a/lib-install.sh b/lib-install.sh index 28125b0..5e77547 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -49,11 +49,11 @@ prepare_swupd() { 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" + prompt -w "CLEAR LINUX: You have 'dnf' installed in your system. It may break your system especially when you remove a package\n" while [[ "${remove}" != "y" && "${remove}" != "n" ]]; do - echo -e "${c_green}" - read -p "You wanna remove it? (y/n): " remove 2>&1 + echo -e "\r${c_green}" + read -p " You wanna remove it? (y/n): " remove 2>&1 echo -e "${c_default}" done fi @@ -63,9 +63,10 @@ prepare_swupd() { 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}" - print -w "CLEAR LINUX: Your 'swupd' is broken\n" - print -i "CLEAR LINUX: Patching 'swupd' distro version detection and try again...\n" - echo -e "${dist}" | rootify tee "/etc/os-release" > /dev/null + prompt -w "\nCLEAR LINUX: Your 'swupd' is broken" + prompt -i "CLEAR LINUX: Patching 'swupd' distro version detection and try again...\n" + rootify rm -rf "/etc/os-release"; echo -e "${dist}" | rootify tee "/usr/lib/os-release" > /dev/null + rootify ln -s "/usr/lib/os-release" "/etc/os-release" rootify swupd update -y fi From 8886bea5c6b6e79b8cb12500ff5e5c7795286595 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Thu, 10 Jun 2021 08:51:40 +0700 Subject: [PATCH 16/40] Differenciate between error and abort signal --- lib-core.sh | 38 +++++++++++++++++--------------------- lib-install.sh | 13 ++++++++----- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index d08537e..f5a5d87 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -220,7 +220,13 @@ 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' @@ -240,7 +246,7 @@ operation_aborted() { # 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 ===========" echo -e "${log}" @@ -277,44 +283,34 @@ operation_aborted() { } rootify() { - local result=0 + local result="0" - trap true SIGINT prompt -w "Executing '$(echo "${@}" | cut -c -35 )...' as root" if [[ -p /dev/stdin ]]; then - ! sudo "${@}" < /dev/stdin && result=1 - error_snippet="${*}" + ! sudo "${@}" < /dev/stdin && result="1"; error_snippet="${*}" else - ! sudo "${@}" && result=1 - error_snippet="${*}" + ! sudo "${@}" && result="1"; error_snippet="${*}" fi - trap signal_exit SIGINT - return "${result}" } userify() { - local result=0 - - trap true SIGINT + local result="0" if [[ -p /dev/stdin ]]; then - ! sudo -u "${MY_USERNAME}" "${@}" < /dev/stdin && result=1 - error_snippet="${*}" + ! sudo -u "${MY_USERNAME}" "${@}" < /dev/stdin && result="1"; error_snippet="${*}" else - ! sudo -u "${MY_USERNAME}" "${@}" && result=1 - error_snippet="${*}" + ! sudo -u "${MY_USERNAME}" "${@}" && result="1"; error_snippet="${*}" fi - trap signal_exit SIGINT - return "${result}" } -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 # diff --git a/lib-install.sh b/lib-install.sh index 5e77547..a5018e4 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -33,7 +33,10 @@ WHITESUR_SOURCE+=("lib-install.sh") # 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' +# 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! installation_sorry() { prompt -w "WARNING: We're sorry, your distro isn't officially supported yet." @@ -63,7 +66,7 @@ prepare_swupd() { 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 "\nCLEAR LINUX: Your 'swupd' is broken" + prompt -w "\n CLEAR LINUX: Your 'swupd' is broken" prompt -i "CLEAR LINUX: Patching 'swupd' distro version detection and try again...\n" rootify rm -rf "/etc/os-release"; echo -e "${dist}" | rootify tee "/usr/lib/os-release" > /dev/null rootify ln -s "/usr/lib/os-release" "/etc/os-release" @@ -720,7 +723,7 @@ show_panel_opacity_dialog() { 2) panel_opacity="${PANEL_OPACITY_VARIANTS[2]}" ;; 3) panel_opacity="${PANEL_OPACITY_VARIANTS[3]}" ;; 4) panel_opacity="${PANEL_OPACITY_VARIANTS[4]}" ;; - *) operation_aborted ;; + *) signal_abort ;; esac fi @@ -742,7 +745,7 @@ show_sidebar_size_dialog() { 2) sidebar_size="${SIDEBAR_SIZE_VARIANTS[2]}" ;; 3) sidebar_size="${SIDEBAR_SIZE_VARIANTS[3]}" ;; 4) sidebar_size="${SIDEBAR_SIZE_VARIANTS[4]}" ;; - *) operation_aborted ;; + *) signal_abort ;; esac fi @@ -762,7 +765,7 @@ show_nautilus_style_dialog() { 1) nautilus_style="${NAUTILUS_STYLE_VARIANTS[1]}" ;; 2) nautilus_style="${NAUTILUS_STYLE_VARIANTS[2]}" ;; 3) nautilus_style="${NAUTILUS_STYLE_VARIANTS[3]}" ;; - *) operation_aborted ;; + *) signal_abort ;; esac fi From b36a11b8c99eaabc9b15100c296a142c6653952e Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Thu, 10 Jun 2021 10:57:01 +0700 Subject: [PATCH 17/40] Differenciate between error and abort signal --- install.sh | 2 - lib-core.sh | 94 +++++++++++++++++---------------------- lib-install.sh | 118 ++++++++++++++++++++++++------------------------- tweaks.sh | 4 +- 4 files changed, 100 insertions(+), 118 deletions(-) diff --git a/install.sh b/install.sh index 15e9ef9..a9cdeab 100755 --- a/install.sh +++ b/install.sh @@ -3,8 +3,6 @@ # 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 ) diff --git a/lib-core.sh b/lib-core.sh index f5a5d87..e64a40f 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,8 +18,10 @@ WHITESUR_SOURCE=("lib-core.sh") # VARIABLES # ############################################################################### +#--------------System--------------# + export WHITESUR_PID=$$ -MY_USERNAME="$(logname 2> /dev/null || echo ${SUDO_USER:-${USER}})" +export MY_USERNAME="$(logname 2> /dev/null || echo ${SUDO_USER:-${USER}})" if command -v gnome-shell &> /dev/null; then if (( $(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f 1) >= 4 )); then @@ -125,9 +125,9 @@ msg="" final_msg="Run '${0} --help' to explore more customization features!" notif_msg="" process_ids=() -# This is important for 'rootify' and 'userify' because 'return "${result}"' is -# considered the last command in 'BASH_COMMAND' variable -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="" @@ -135,14 +135,14 @@ swupd_packages="" swupd_url="https://cdn.download.clearlinux.org/current/x86_64/os/Packages/" swupd_ver_url="https://cdn.download.clearlinux.org/latest" -#------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}• " @@ -152,6 +152,8 @@ anim=( " ${c_blue}•${c_green}•${c_red}•${c_magenta}• " ) +export SUDO_PROMPT="${c_yellow} SUDO: Authentication is required\n${c_green} SUDO: Password (${MY_USERNAME}): " + ############################################################################### # CORE UTILITIES # ############################################################################### @@ -259,11 +261,11 @@ signal_error() { 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 @@ -282,32 +284,6 @@ signal_error() { rm -rf "${WHITESUR_TMP_DIR}"; exit 1 } -rootify() { - local result="0" - - prompt -w "Executing '$(echo "${@}" | cut -c -35 )...' as root" - - if [[ -p /dev/stdin ]]; then - ! sudo "${@}" < /dev/stdin && result="1"; error_snippet="${*}" - else - ! sudo "${@}" && result="1"; error_snippet="${*}" - fi - - return "${result}" -} - -userify() { - local result="0" - - if [[ -p /dev/stdin ]]; then - ! sudo -u "${MY_USERNAME}" "${@}" < /dev/stdin && result="1"; error_snippet="${*}" - else - ! sudo -u "${MY_USERNAME}" "${@}" && result="1"; error_snippet="${*}" - fi - - return "${result}" -} - trap 'signal_exit' EXIT trap 'signal_error' ERR trap 'signal_abort' INT TERM TSTP @@ -569,10 +545,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 @@ -582,19 +558,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 } @@ -610,7 +586,19 @@ remind_relative_path() { # MISC # ############################################################################### -full_rootify() { +udo() { + local result="0" + + if [[ -p /dev/stdin ]]; then + ! sudo -u "${MY_USERNAME}" "${@}" < /dev/stdin && result="1"; WHITESUR_COMMAND="${*}" + else + ! sudo -u "${MY_USERNAME}" "${@}" && result="1"; WHITESUR_COMMAND="${*}" + fi + + 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" diff --git a/lib-install.sh b/lib-install.sh index a5018e4..83f685f 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 # @@ -52,30 +50,30 @@ prepare_swupd() { 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\n" + prompt -w "CLEAR LINUX: You have 'dnf' installed in your system. It may break your system especially when you remove a package" while [[ "${remove}" != "y" && "${remove}" != "n" ]]; do echo -e "\r${c_green}" - read -p " You wanna remove it? (y/n): " remove 2>&1 + read -p " CLEAR LINUX: You wanna remove it? (y/n): " remove 2>&1 echo -e "${c_default}" done fi - if ! rootify swupd update -y; then + 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" - rootify rm -rf "/etc/os-release"; echo -e "${dist}" | rootify tee "/usr/lib/os-release" > /dev/null - rootify ln -s "/usr/lib/os-release" "/etc/os-release" + 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" - rootify swupd update -y + sudo swupd update -y fi - if ! has_command bsdtar; then rootify swupd bundle-add libarchive; fi - if [[ "${remove}" == "y" ]]; then rootify swupd bundle-remove -y dnf; fi + if ! has_command bsdtar; then sudo swupd bundle-add libarchive; fi + if [[ "${remove}" == "y" ]]; then sudo swupd bundle-remove -y dnf; fi } install_swupd_packages() { @@ -85,17 +83,17 @@ install_swupd_packages() { for key in "${@}"; do for pkg in $(echo "${swupd_packages}" | grep -F "${key}"); do - curl -s -o - "${swupd_url}/${pkg}" | rootify bsdtar -xf - -C "/" + curl -s -o - "${swupd_url}/${pkg}" | sudo bsdtar -xf - -C "/" done done } prepare_xbps() { # 'xbps-install' requires 'xbps' to be always up-to-date - rootify xbps-install -Syu xbps + 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 - rootify vkpurge rm all + sudo vkpurge rm all } install_theme_deps() { @@ -104,24 +102,24 @@ install_theme_deps() { prompt -w "\n 'glib2.0', 'sassc', 'xmllint', and 'libmurrine' are required for theme installation.\n" if has_command zypper; then - rootify zypper in -y sassc glib2-devel gtk2-engine-murrine libxml2-tools + sudo zypper in -y sassc glib2-devel gtk2-engine-murrine libxml2-tools elif has_command swupd; then # Rolling release - prepare_swupd && rootify swupd bundle-add libglib libxml2 && install_swupd_packages sassc libsass + prepare_swupd && sudo swupd bundle-add libglib libxml2 && install_swupd_packages sassc libsass elif has_command apt; then - rootify apt install -y sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils + sudo 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 + sudo 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 + sudo yum install -y sassc glib2-devel gtk-murrine-engine libxml2 elif has_command pacman; then # Rolling release - rootify pacman -Syu --noconfirm --needed sassc glib2 gtk-engine-murrine libxml2 + sudo pacman -Syu --noconfirm --needed sassc glib2 gtk-engine-murrine 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 && rootify xbps-install -Sy sassc glib-devel gtk-engine-murrine + prepare_xbps && sudo xbps-install -Sy sassc glib-devel gtk-engine-murrine else installation_sorry fi @@ -133,22 +131,22 @@ install_beggy_deps() { prompt -w "\n 'imagemagick' are required for background editing.\n" if has_command zypper; then - rootify zypper in -y ImageMagick + sudo zypper in -y ImageMagick elif has_command swupd; then # Rolling release - prepare_swupd && rootify swupd bundle-add ImageMagick + prepare_swupd && sudo swupd bundle-add ImageMagick elif has_command apt; then - rootify apt install -y imagemagick + sudo apt install -y 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 # Rolling release - rootify pacman -Syu --noconfirm --needed imagemagick + sudo pacman -Syu --noconfirm --needed imagemagick elif has_command xbps-install; then # Rolling release - prepare_xbps && rootify xbps-install -Sy ImageMagick + prepare_xbps && sudo xbps-install -Sy ImageMagick else installation_sorry fi @@ -160,22 +158,22 @@ install_dialog_deps() { prompt -w "\n 'dialog' is required for this option.\n" 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 + sudo apt install -y 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 # Rolling release - rootify pacman -Syu --noconfirm --needed dialog + sudo pacman -Syu --noconfirm --needed dialog elif has_command xbps-install; then # Rolling release - prepare_xbps && rootify xbps-install -Sy dialog + prepare_xbps && sudo xbps-install -Sy dialog else installation_sorry fi @@ -518,8 +516,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 } @@ -539,14 +537,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 } @@ -561,8 +559,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() { @@ -583,22 +581,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 } @@ -607,26 +605,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 } diff --git a/tweaks.sh b/tweaks.sh index 03a5fbb..885d18d 100755 --- a/tweaks.sh +++ b/tweaks.sh @@ -3,8 +3,6 @@ # 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 ) @@ -93,7 +91,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" From a384f71c2c4c2b534e7a93a400003059902d30d9 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Thu, 10 Jun 2021 13:33:45 +0700 Subject: [PATCH 18/40] Differenciate between error and abort signal --- lib-core.sh | 44 +++++++++++++++++++++++++++++++++++++++----- lib-install.sh | 4 +--- 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index e64a40f..c55b4e5 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -42,6 +42,8 @@ else SED_OPT="-i" fi +SUDO_BIN="$(which sudo)" + #------------Directories--------------# THEME_SRC_DIR="${REPO_DIR}/src" DASH_TO_DOCK_SRC_DIR="${REPO_DIR}/src/other/dash-to-dock" @@ -152,8 +154,6 @@ anim=( " ${c_blue}•${c_green}•${c_red}•${c_magenta}• " ) -export SUDO_PROMPT="${c_yellow} SUDO: Authentication is required\n${c_green} SUDO: Password (${MY_USERNAME}): " - ############################################################################### # CORE UTILITIES # ############################################################################### @@ -292,6 +292,12 @@ trap 'signal_abort' INT TERM TSTP # USER UTILITIES # ############################################################################### +ask() { + echo -e "${c_magenta}\r" + read -p " ${2}" ${1} 2>&1 + echo -e "${c_default}" +} + helpify_title() { printf "${c_cyan}%s${c_blue}%s ${c_green}%s\n\n" "Usage: " "$0" "[OPTIONS...]" printf "${c_cyan}%s\n" "OPTIONS:" @@ -586,13 +592,41 @@ remind_relative_path() { # MISC # ############################################################################### +sudo() { + local result="0" + + prompt -w "Executing '$(echo "${@}" | cut -c -35 )...' as root" + + if ! ${SUDO_BIN} -n true 2> /dev/null; then + echo -e "${c_magenta} Authentication is required:${c_default}" + fi + + # Don't combine '[[ ... ]]' and '! ... < /dev/stdin' cause it's gonna + # break the logic/workflow + if [[ -p /dev/stdin ]]; then + if ! ${SUDO_BIN} "${@}" < /dev/stdin; then + result="1"; WHITESUR_COMMAND="${*}" + fi + elif ! ${SUDO_BIN} "${@}"; then + result="1"; WHITESUR_COMMAND="${*}" + fi + + echo -e "${c_default}" + + return "${result}" +} + udo() { local result="0" + # Don't combine '[[ ... ]]' and '! ... < /dev/stdin' cause it's gonna + # break the logic/workflow if [[ -p /dev/stdin ]]; then - ! sudo -u "${MY_USERNAME}" "${@}" < /dev/stdin && result="1"; WHITESUR_COMMAND="${*}" - else - ! sudo -u "${MY_USERNAME}" "${@}" && result="1"; WHITESUR_COMMAND="${*}" + if ! ${SUDO_BIN} -u "${MY_USERNAME}" "${@}" < /dev/stdin; then + result="1"; WHITESUR_COMMAND="${*}" + fi + elif ! ${SUDO_BIN} -u "${MY_USERNAME}" "${@}"; then + result="1"; WHITESUR_COMMAND="${*}" fi return "${result}" diff --git a/lib-install.sh b/lib-install.sh index 83f685f..7f87c12 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -53,9 +53,7 @@ prepare_swupd() { prompt -w "CLEAR LINUX: You have 'dnf' installed in your system. It may break your system especially when you remove a package" while [[ "${remove}" != "y" && "${remove}" != "n" ]]; do - echo -e "\r${c_green}" - read -p " CLEAR LINUX: You wanna remove it? (y/n): " remove 2>&1 - echo -e "${c_default}" + ask remove "CLEAR LINUX: You wanna remove it? (y/n): " done fi From 8f97690274a6d487b6f54c5be0eb0c829ca53c60 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Thu, 10 Jun 2021 15:54:13 +0700 Subject: [PATCH 19/40] Differenciate between error and abort signal --- lib-core.sh | 20 +++++++++++++------- lib-install.sh | 17 +++++++++++------ 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index c55b4e5..27d5c92 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -136,6 +136,8 @@ 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" #------------Decoration-----------# export c_default="\033[0m" @@ -147,11 +149,11 @@ 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}•" ) ############################################################################### @@ -298,6 +300,12 @@ ask() { echo -e "${c_default}" } +confirm() { + while [[ "${!1}" != "y" && "${!1}" != "n" ]]; do + ask ${1} "${2}" + done +} + helpify_title() { printf "${c_cyan}%s${c_blue}%s ${c_green}%s\n\n" "Usage: " "$0" "[OPTIONS...]" printf "${c_cyan}%s\n" "OPTIONS:" @@ -611,8 +619,6 @@ sudo() { result="1"; WHITESUR_COMMAND="${*}" fi - echo -e "${c_default}" - return "${result}" } diff --git a/lib-install.sh b/lib-install.sh index 7f87c12..2bc6a78 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -44,6 +44,8 @@ installation_sorry() { } prepare_swupd() { + [[ "${swupd_prepared}" == "true" ]] && return 0 + local remove="" local ver="" local conf="" @@ -51,10 +53,7 @@ prepare_swupd() { 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" - - while [[ "${remove}" != "y" && "${remove}" != "n" ]]; do - ask remove "CLEAR LINUX: You wanna remove it? (y/n): " - done + confirm remove "CLEAR LINUX: You wanna remove it? (y/n): " fi if ! sudo swupd update -y; then @@ -72,6 +71,8 @@ prepare_swupd() { 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() { @@ -87,11 +88,15 @@ install_swupd_packages() { } 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 + + xbps_prepared="true" } install_theme_deps() { @@ -754,8 +759,8 @@ show_nautilus_style_dialog() { --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 ) + 2 "${NAUTILUS_STYLE_VARIANTS[2]}" off \ + 3 "${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]}" ;; From b44ef3a5ed9d05e35de4aee9162297858f5fa3f3 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Thu, 10 Jun 2021 20:33:31 +0700 Subject: [PATCH 20/40] Differenciate between error and abort signal --- lib-core.sh | 21 ++++++++++++++++++ lib-install.sh | 59 +++----------------------------------------------- 2 files changed, 24 insertions(+), 56 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index d4f4c06..2286a03 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -306,6 +306,27 @@ confirm() { done } +dialogify() { + 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:" diff --git a/lib-install.sh b/lib-install.sh index 2bc6a78..300c852 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -709,68 +709,15 @@ 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]}" ;; - *) signal_abort ;; - esac - fi - - clear + 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]}" ;; - *) signal_abort ;; - esac - fi - - clear + 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 \ - 2 "${NAUTILUS_STYLE_VARIANTS[2]}" off \ - 3 "${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]}" ;; - *) signal_abort ;; - esac - fi - - clear + dialogify nautilus_style "${THEME_NAME}" "Choose your Nautilus style (default is BigSur-like style)" ${NAUTILUS_STYLE_VARIANTS[*]} } show_needed_dialogs() { From 2429e2178cc6c2b921d2d3ceaa384138d65e4fbb Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Fri, 11 Jun 2021 07:16:45 +0700 Subject: [PATCH 21/40] Improve stability --- lib-core.sh | 14 ++++++-------- lib-install.sh | 12 +++++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index 2286a03..9bb0a3a 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -21,7 +21,7 @@ WHITESUR_SOURCE=("lib-core.sh") #--------------System--------------# export WHITESUR_PID=$$ -export MY_USERNAME="$(logname 2> /dev/null || echo ${SUDO_USER:-${USER}})" +MY_USERNAME="$(logname 2> /dev/null || echo ${SUDO_USER:-${USER}})" if command -v gnome-shell &> /dev/null; then if (( $(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f 1) >= 4 )); then @@ -253,10 +253,10 @@ signal_error() { prompt -e "\n\n Oops! Operation failed...\n" prompt -e "=========== ERROR LOG ===========" - echo -e "${log}" - - if [[ ! "${log}" ]] ; 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 ==========" @@ -571,7 +571,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 # @@ -676,7 +676,5 @@ finalize_argument_parsing() { [[ "${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 fi } diff --git a/lib-install.sh b/lib-install.sh index 300c852..a36b9bb 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -52,8 +52,8 @@ prepare_swupd() { 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? (y/n): " + prompt -w "CLEAR LINUX: You have 'dnf' installed in your system. It may break your system especially when you remove a package\n" + confirm remove "CLEAR LINUX: You wanna remove it? (y/n): "; echo fi if ! sudo swupd update -y; then @@ -90,11 +90,11 @@ install_swupd_packages() { 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 + # 'xbps-install' requires 'xbps' to be always up-to-date + sudo xbps-install -Syu xbps xbps_prepared="true" } @@ -117,7 +117,9 @@ install_theme_deps() { sudo yum install -y sassc glib2-devel gtk-murrine-engine libxml2 elif has_command pacman; then # Rolling release - sudo pacman -Syu --noconfirm --needed sassc glib2 gtk-engine-murrine libxml2 + # '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 + sudo pacman -Syyu --noconfirm --needed sassc glib2 gtk-engine-murrine libxml2 elif has_command xbps-install; then # Rolling release # 'libxml2' is already included here, and it's gonna broke the installation From fae1cd0c81198230e8eddca0dd5f5fc2f819b3bb Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Fri, 11 Jun 2021 09:17:28 +0700 Subject: [PATCH 22/40] Improve stability --- lib-core.sh | 2 +- lib-install.sh | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index 9bb0a3a..fd850ab 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -235,7 +235,7 @@ signal_error() { IFS=$'\n' local sources=($(basename -a "${WHITESUR_SOURCE[@]}" "${BASH_SOURCE[@]}" | sort -u)) - local dist_ids=($(awk -F '=' '/ID/{print $2}' "/etc/os-release" | sort -Vru)) + 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 "")" diff --git a/lib-install.sh b/lib-install.sh index a36b9bb..a8ce601 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -36,6 +36,10 @@ WHITESUR_SOURCE+=("lib-install.sh") # 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 + 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" @@ -102,7 +106,7 @@ prepare_xbps() { install_theme_deps() { if ! has_command glib-compile-resources || ! has_command sassc || ! has_command xmllint || (! is_my_distro "clear-linux" && [[ ! -r "/usr/share/gtk-engines/murrine.xml" ]]); then - prompt -w "\n 'glib2.0', 'sassc', 'xmllint', and 'libmurrine' are required for theme installation.\n" + prompt -w "'glib2.0', 'sassc', 'xmllint', and 'libmurrine' are required for theme installation." if has_command zypper; then sudo zypper in -y sassc glib2-devel gtk2-engine-murrine libxml2-tools @@ -110,7 +114,7 @@ install_theme_deps() { # Rolling release prepare_swupd && sudo swupd bundle-add libglib libxml2 && install_swupd_packages sassc libsass elif has_command apt; then - sudo apt install -y sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils + sudo apt update && sudo apt install -y sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils elif has_command dnf; then sudo dnf install -y sassc glib2-devel gtk-murrine-engine libxml2 elif has_command yum; then @@ -133,7 +137,7 @@ install_theme_deps() { install_beggy_deps() { if ! has_command convert; then - prompt -w "\n 'imagemagick' are required for background editing.\n" + prompt -w "'imagemagick' are required for background editing." if has_command zypper; then sudo zypper in -y ImageMagick @@ -141,7 +145,7 @@ install_beggy_deps() { # Rolling release prepare_swupd && sudo swupd bundle-add ImageMagick elif has_command apt; then - sudo apt install -y imagemagick + sudo apt update && sudo apt install -y imagemagick elif has_command dnf; then sudo dnf install -y ImageMagick elif has_command yum; then @@ -160,7 +164,7 @@ install_beggy_deps() { install_dialog_deps() { if ! has_command dialog; then - prompt -w "\n 'dialog' is required for this option.\n" + prompt -w "'dialog' is required for this option." if has_command zypper; then sudo zypper in -y dialog @@ -168,7 +172,7 @@ install_dialog_deps() { # Rolling release prepare_swupd && install_swupd_packages dialog elif has_command apt; then - sudo apt install -y dialog + sudo apt update && sudo apt install -y dialog elif has_command dnf; then sudo dnf install -y dialog elif has_command yum; then From 67c6846feb9b377f33439c8d102db5bb1c96c2a3 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Fri, 11 Jun 2021 12:11:02 +0700 Subject: [PATCH 23/40] Improve stability --- lib-core.sh | 4 ++-- lib-install.sh | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index fd850ab..349c809 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -296,13 +296,13 @@ trap 'signal_abort' INT TERM TSTP ask() { echo -e "${c_magenta}\r" - read -p " ${2}" ${1} 2>&1 + read -p " ${2}: " ${1} 2>&1 echo -e "${c_default}" } confirm() { while [[ "${!1}" != "y" && "${!1}" != "n" ]]; do - ask ${1} "${2}" + ask ${1} "${2} (y/n)" done } diff --git a/lib-install.sh b/lib-install.sh index a8ce601..f1840e2 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -57,7 +57,7 @@ prepare_swupd() { 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\n" - confirm remove "CLEAR LINUX: You wanna remove it? (y/n): "; echo + confirm remove "CLEAR LINUX: You wanna remove it?"; echo fi if ! sudo swupd update -y; then @@ -94,12 +94,13 @@ install_swupd_packages() { prepare_xbps() { [[ "${xbps_prepared}" == "true" ]] && return 0 - # 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 # '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" } From 5be548be7900759936c2c158870bcce3095a2f9d Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Fri, 11 Jun 2021 15:04:34 +0700 Subject: [PATCH 24/40] Improve stability --- lib-core.sh | 1 + lib-install.sh | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index 349c809..52b70d2 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -137,6 +137,7 @@ swupd_packages="" swupd_url="https://cdn.download.clearlinux.org/current/x86_64/os/Packages/" swupd_ver_url="https://cdn.download.clearlinux.org/latest" swupd_prepared="false" +apt_prepared="false" xbps_prepared="false" #------------Decoration-----------# diff --git a/lib-install.sh b/lib-install.sh index f1840e2..8cd7e49 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -40,6 +40,9 @@ WHITESUR_SOURCE+=("lib-install.sh") # 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 +# Sometimes, some Ubuntu distro doesn't enable automatic time. This can cause +# 'Release file for ... is not valid yet' + 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" @@ -91,6 +94,16 @@ install_swupd_packages() { done } +prepare_apt() { + [[ "${apt_prepared}" == "true" ]] && return 0 + + if ! sudo apt update && [[ "${?}" == "100" ]]; then + prompt -w "\n APT: Your system clock might be wrong" + prompt -i "APT: Updating your system clock and try again...\n" + sudo systemctl restart systemd-timesyncd; sudo apt update + fi +} + prepare_xbps() { [[ "${xbps_prepared}" == "true" ]] && return 0 @@ -115,7 +128,7 @@ install_theme_deps() { # Rolling release prepare_swupd && sudo swupd bundle-add libglib libxml2 && install_swupd_packages sassc libsass elif has_command apt; then - sudo apt update && sudo apt install -y sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils + prepare_apt && sudo apt install -y sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils elif has_command dnf; then sudo dnf install -y sassc glib2-devel gtk-murrine-engine libxml2 elif has_command yum; then @@ -146,7 +159,7 @@ install_beggy_deps() { # Rolling release prepare_swupd && sudo swupd bundle-add ImageMagick elif has_command apt; then - sudo apt update && sudo apt install -y imagemagick + prepare_apt && sudo apt install -y imagemagick elif has_command dnf; then sudo dnf install -y ImageMagick elif has_command yum; then @@ -173,7 +186,7 @@ install_dialog_deps() { # Rolling release prepare_swupd && install_swupd_packages dialog elif has_command apt; then - sudo apt update && sudo apt install -y dialog + prepare_apt && sudo apt install -y dialog elif has_command dnf; then sudo dnf install -y dialog elif has_command yum; then From 5cbcb74b20e4c75e1996f2f4fea1802486ad71fd Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Fri, 11 Jun 2021 18:59:07 +0700 Subject: [PATCH 25/40] Improve stability --- install.sh | 5 +++-- lib-core.sh | 1 - lib-install.sh | 49 ++++++++++++++++++++++++++++++++----------------- tweaks.sh | 3 ++- 4 files changed, 37 insertions(+), 21 deletions(-) diff --git a/install.sh b/install.sh index 8ab7f93..664d0e0 100755 --- a/install.sh +++ b/install.sh @@ -5,6 +5,8 @@ # # 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 # @@ -115,10 +117,9 @@ if [[ "${uninstall}" == 'true' ]]; then remove_themes prompt -s "Done! All '${name}' themes has been removed." else - install_theme_deps; echo + echo if [[ "${interactive}" == 'true' ]]; then - install_dialog_deps show_panel_opacity_dialog; show_sidebar_size_dialog; show_nautilus_style_dialog prompt -w "DIALOG: '--size' and '--panel' parameters are ignored if exist."; echo else diff --git a/lib-core.sh b/lib-core.sh index 52b70d2..349c809 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -137,7 +137,6 @@ swupd_packages="" swupd_url="https://cdn.download.clearlinux.org/current/x86_64/os/Packages/" swupd_ver_url="https://cdn.download.clearlinux.org/latest" swupd_prepared="false" -apt_prepared="false" xbps_prepared="false" #------------Decoration-----------# diff --git a/lib-install.sh b/lib-install.sh index 8cd7e49..9a98522 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -40,9 +40,13 @@ WHITESUR_SOURCE+=("lib-install.sh") # 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 +#--------------------OTHERS--------------------# # Sometimes, some Ubuntu distro doesn't enable automatic time. This can cause -# 'Release file for ... is not valid yet' +# '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" @@ -50,6 +54,19 @@ installation_sorry() { start_animation; sleep 15; stop_animation } +prepare_deps() { + local head="$(curl -Is -o - 'time.cloudflare.com' || wget -Sq -o - --max-redirect=0 'time.cloudflare.com')" + local remote_time="$(echo "${head}" | awk -F ': ' '/Date/{print $2}')" + local remote_time_int="$(date --date "${remote_time}" +"%Y%m%d")" + local local_time_int="$(date -u +"%Y%m%d")" + + if (( remote_time_int > local_time_int )); then + prompt -w "\n DEPS: Your system clock is wrong" + prompt -i "DEPS: Updating your system clock and try again...\n" + sudo date -s "${remote_time}"; sudo hwclock --systohc + fi +} + prepare_swupd() { [[ "${swupd_prepared}" == "true" ]] && return 0 @@ -94,16 +111,6 @@ install_swupd_packages() { done } -prepare_apt() { - [[ "${apt_prepared}" == "true" ]] && return 0 - - if ! sudo apt update && [[ "${?}" == "100" ]]; then - prompt -w "\n APT: Your system clock might be wrong" - prompt -i "APT: Updating your system clock and try again...\n" - sudo systemctl restart systemd-timesyncd; sudo apt update - fi -} - prepare_xbps() { [[ "${xbps_prepared}" == "true" ]] && return 0 @@ -117,10 +124,13 @@ prepare_xbps() { xbps_prepared="true" } +#-----------------Deps-----------------# + install_theme_deps() { if ! has_command glib-compile-resources || ! has_command sassc || ! has_command xmllint || (! is_my_distro "clear-linux" && [[ ! -r "/usr/share/gtk-engines/murrine.xml" ]]); then prompt -w "'glib2.0', 'sassc', 'xmllint', and 'libmurrine' are required for theme installation." + prepare_deps if has_command zypper; then sudo zypper in -y sassc glib2-devel gtk2-engine-murrine libxml2-tools @@ -128,7 +138,7 @@ install_theme_deps() { # Rolling release prepare_swupd && sudo swupd bundle-add libglib libxml2 && install_swupd_packages sassc libsass elif has_command apt; then - prepare_apt && sudo apt install -y sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils + sudo apt update && sudo apt install -y sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils elif has_command dnf; then sudo dnf install -y sassc glib2-devel gtk-murrine-engine libxml2 elif has_command yum; then @@ -152,6 +162,7 @@ install_theme_deps() { install_beggy_deps() { if ! has_command convert; then prompt -w "'imagemagick' are required for background editing." + prepare_deps if has_command zypper; then sudo zypper in -y ImageMagick @@ -159,7 +170,7 @@ install_beggy_deps() { # Rolling release prepare_swupd && sudo swupd bundle-add ImageMagick elif has_command apt; then - prepare_apt && sudo apt install -y imagemagick + sudo apt update && sudo apt install -y imagemagick elif has_command dnf; then sudo dnf install -y ImageMagick elif has_command yum; then @@ -179,6 +190,7 @@ install_beggy_deps() { install_dialog_deps() { if ! has_command dialog; then prompt -w "'dialog' is required for this option." + prepare_deps if has_command zypper; then sudo zypper in -y dialog @@ -186,7 +198,7 @@ install_dialog_deps() { # Rolling release prepare_swupd && install_swupd_packages dialog elif has_command apt; then - prepare_apt && sudo apt install -y dialog + sudo apt update && sudo apt install -y dialog elif has_command dnf; then sudo dnf install -y dialog elif has_command yum; then @@ -281,6 +293,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}" @@ -438,7 +452,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 @@ -729,20 +743,21 @@ customize_theme() { # values are taken from _variables.scss show_panel_opacity_dialog() { + install_dialog_deps dialogify panel_opacity "${THEME_NAME}" "Choose your panel opacity (Default is 15)" ${PANEL_OPACITY_VARIANTS[*]} } show_sidebar_size_dialog() { + install_dialog_deps dialogify sidebar_size "${THEME_NAME}" "Choose your Nautilus minimum sidebar size (default is 200px)" ${SIDEBAR_SIZE_VARIANTS[*]} } show_nautilus_style_dialog() { + 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/tweaks.sh b/tweaks.sh index 885d18d..b2d1449 100755 --- a/tweaks.sh +++ b/tweaks.sh @@ -5,6 +5,8 @@ # # 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 # @@ -171,7 +173,6 @@ else if [[ "${gdm}" == 'true' ]]; then echo; prompt -i "Installing '${name}' GDM theme..." - install_theme_deps; install_gdm_theme echo; prompt -s "Done! '${name}' GDM theme has been installed." fi From 3912767cd0c9278bd7f16ea8ca604087690e21f6 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Fri, 11 Jun 2021 20:48:43 +0700 Subject: [PATCH 26/40] Improve stability --- install.sh | 2 +- lib-core.sh | 1 + lib-install.sh | 22 +++++++++++++++++----- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/install.sh b/install.sh index 664d0e0..7aed090 100755 --- a/install.sh +++ b/install.sh @@ -121,7 +121,7 @@ else 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 diff --git a/lib-core.sh b/lib-core.sh index 349c809..52b70d2 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -137,6 +137,7 @@ swupd_packages="" swupd_url="https://cdn.download.clearlinux.org/current/x86_64/os/Packages/" swupd_ver_url="https://cdn.download.clearlinux.org/latest" swupd_prepared="false" +apt_prepared="false" xbps_prepared="false" #------------Decoration-----------# diff --git a/lib-install.sh b/lib-install.sh index 9a98522..cd9f53c 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -62,8 +62,8 @@ prepare_deps() { if (( remote_time_int > local_time_int )); then prompt -w "\n DEPS: Your system clock is wrong" - prompt -i "DEPS: Updating your system clock and try again...\n" - sudo date -s "${remote_time}"; sudo hwclock --systohc + prompt -i "DEPS: Updating your system clock...\n" + sudo date -s "${remote_time}" &> /dev/null; sudo hwclock --systohc fi } @@ -111,6 +111,18 @@ install_swupd_packages() { done } +prepare_apt() { + [[ "${apt_prepared}" == "true" ]] && return 0 + + if ! sudo apt update; then + prompt -w "\n APT: Your repo lists are broken" + prompt -i "APT: Full-cleaning your repo lists and try again...\n" + sudo apt clean; sudo rm -rf /var/lib/apt/lists; sudo apt update + fi + + apt_prepared="true" +} + prepare_xbps() { [[ "${xbps_prepared}" == "true" ]] && return 0 @@ -138,7 +150,7 @@ install_theme_deps() { # Rolling release prepare_swupd && sudo swupd bundle-add libglib libxml2 && install_swupd_packages sassc libsass elif has_command apt; then - sudo apt update && sudo apt install -y sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils + prepare_apt && sudo apt install -y sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils elif has_command dnf; then sudo dnf install -y sassc glib2-devel gtk-murrine-engine libxml2 elif has_command yum; then @@ -170,7 +182,7 @@ install_beggy_deps() { # Rolling release prepare_swupd && sudo swupd bundle-add ImageMagick elif has_command apt; then - sudo apt update && sudo apt install -y imagemagick + prepare_apt && sudo apt install -y imagemagick elif has_command dnf; then sudo dnf install -y ImageMagick elif has_command yum; then @@ -198,7 +210,7 @@ install_dialog_deps() { # Rolling release prepare_swupd && install_swupd_packages dialog elif has_command apt; then - sudo apt update && sudo apt install -y dialog + prepare_apt && sudo apt install -y dialog elif has_command dnf; then sudo dnf install -y dialog elif has_command yum; then From 9dd112f1b00ac78b46286159e5997f2743ab66dc Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Sat, 12 Jun 2021 10:07:19 +0700 Subject: [PATCH 27/40] Improve stability --- lib-core.sh | 55 ++++++++++++++++++++++++++------------------------ lib-install.sh | 23 ++++++++++----------- 2 files changed, 40 insertions(+), 38 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index 52b70d2..4c30443 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -21,7 +21,7 @@ WHITESUR_SOURCE=("lib-core.sh") #--------------System--------------# export WHITESUR_PID=$$ -MY_USERNAME="$(logname 2> /dev/null || echo ${SUDO_USER:-${USER}})" +MY_USERNAME="$(logname || echo ${SUDO_USER:-${USER}})" if command -v gnome-shell &> /dev/null; then if (( $(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f 1) >= 4 )); then @@ -137,7 +137,6 @@ swupd_packages="" swupd_url="https://cdn.download.clearlinux.org/current/x86_64/os/Packages/" swupd_ver_url="https://cdn.download.clearlinux.org/latest" swupd_prepared="false" -apt_prepared="false" xbps_prepared="false" #------------Decoration-----------# @@ -241,7 +240,7 @@ signal_error() { 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 @@ -296,9 +295,9 @@ trap 'signal_abort' INT TERM TSTP ############################################################################### ask() { - echo -e "${c_magenta}\r" + echo -ne "${c_magenta}" read -p " ${2}: " ${1} 2>&1 - echo -e "${c_default}" + echo -ne "${c_default}" } confirm() { @@ -343,7 +342,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() { @@ -492,8 +491,6 @@ check_param() { fi done ;; -a) - [[ "${alts_set}" == "false" ]] && alts=() - if [[ "${value}" == "all" ]]; then for i in {0..2}; do alts+=("${ALT_VARIANTS[i]}") @@ -623,40 +620,46 @@ remind_relative_path() { ############################################################################### sudo() { - local result="0" + local result="1" prompt -w "Executing '$(echo "${@}" | cut -c -35 )...' as root" - if ! ${SUDO_BIN} -n true 2> /dev/null; then + if ! ${SUDO_BIN} -n true &> /dev/null; then echo -e "${c_magenta} Authentication is required:${c_default}" fi - # Don't combine '[[ ... ]]' and '! ... < /dev/stdin' cause it's gonna - # break the logic/workflow if [[ -p /dev/stdin ]]; then - if ! ${SUDO_BIN} "${@}" < /dev/stdin; then - result="1"; WHITESUR_COMMAND="${*}" - fi - elif ! ${SUDO_BIN} "${@}"; then - result="1"; WHITESUR_COMMAND="${*}" + ${SUDO_BIN} "${@}" < /dev/stdin + else + ${SUDO_BIN} "${@}" fi + result="${?}" + + [[ "${result}" != "0" ]] && WHITESUR_COMMAND="${*}" + return "${result}" } udo() { - local result="0" + local result="1" - # Don't combine '[[ ... ]]' and '! ... < /dev/stdin' cause it's gonna - # break the logic/workflow - if [[ -p /dev/stdin ]]; then - if ! ${SUDO_BIN} -u "${MY_USERNAME}" "${@}" < /dev/stdin; then - result="1"; WHITESUR_COMMAND="${*}" - fi - elif ! ${SUDO_BIN} -u "${MY_USERNAME}" "${@}"; then - result="1"; WHITESUR_COMMAND="${*}" + # 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 + else + ${SUDO_BIN} -u "${MY_USERNAME}" "${@}" + fi + + result="${?}" + + [[ "${result}" != "0" ]] && WHITESUR_COMMAND="${*}" + return "${result}" } diff --git a/lib-install.sh b/lib-install.sh index cd9f53c..a09ed99 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -63,7 +63,7 @@ prepare_deps() { if (( remote_time_int > local_time_int )); then prompt -w "\n DEPS: Your system clock is wrong" prompt -i "DEPS: Updating your system clock...\n" - sudo date -s "${remote_time}" &> /dev/null; sudo hwclock --systohc + sudo date -s "${remote_time}"; sudo hwclock --systohc fi } @@ -76,7 +76,7 @@ prepare_swupd() { 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\n" + 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 @@ -111,16 +111,15 @@ install_swupd_packages() { done } -prepare_apt() { - [[ "${apt_prepared}" == "true" ]] && return 0 +prepare_install_apt_packages() { + sudo apt update -y; sudo apt install -y "${@}" - if ! sudo apt update; then - prompt -w "\n APT: Your repo lists are broken" + if [[ "${?}" == "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; sudo rm -rf /var/lib/apt/lists; sudo apt update + sudo apt clean -y; sudo rm -rf /var/lib/apt/lists + sudo apt update -y; sudo apt install -y "${@}" fi - - apt_prepared="true" } prepare_xbps() { @@ -150,7 +149,7 @@ install_theme_deps() { # Rolling release prepare_swupd && sudo swupd bundle-add libglib libxml2 && install_swupd_packages sassc libsass elif has_command apt; then - prepare_apt && sudo apt install -y sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils + prepare_install_apt_packages sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils elif has_command dnf; then sudo dnf install -y sassc glib2-devel gtk-murrine-engine libxml2 elif has_command yum; then @@ -182,7 +181,7 @@ install_beggy_deps() { # Rolling release prepare_swupd && sudo swupd bundle-add ImageMagick elif has_command apt; then - prepare_apt && sudo apt install -y imagemagick + prepare_install_apt_packages imagemagick elif has_command dnf; then sudo dnf install -y ImageMagick elif has_command yum; then @@ -210,7 +209,7 @@ install_dialog_deps() { # Rolling release prepare_swupd && install_swupd_packages dialog elif has_command apt; then - prepare_apt && sudo apt install -y dialog + prepare_install_apt_packages dialog elif has_command dnf; then sudo dnf install -y dialog elif has_command yum; then From fd2c80cc89571dd0075c11d35e5b53391395e788 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Sat, 12 Jun 2021 10:25:56 +0700 Subject: [PATCH 28/40] Improve stability --- lib-core.sh | 14 +++++--------- lib-install.sh | 6 ++++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index 4c30443..016b8bc 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -21,7 +21,7 @@ WHITESUR_SOURCE=("lib-core.sh") #--------------System--------------# export WHITESUR_PID=$$ -MY_USERNAME="$(logname || echo ${SUDO_USER:-${USER}})" +MY_USERNAME="$(logname 2> /dev/null || echo ${SUDO_USER:-${USER}})" if command -v gnome-shell &> /dev/null; then if (( $(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f 1) >= 4 )); then @@ -629,13 +629,11 @@ sudo() { fi if [[ -p /dev/stdin ]]; then - ${SUDO_BIN} "${@}" < /dev/stdin + ${SUDO_BIN} "${@}" < /dev/stdin || result="${?}" else - ${SUDO_BIN} "${@}" + ${SUDO_BIN} "${@}" || result="${?}" fi - result="${?}" - [[ "${result}" != "0" ]] && WHITESUR_COMMAND="${*}" return "${result}" @@ -651,13 +649,11 @@ udo() { fi if [[ -p /dev/stdin ]]; then - ${SUDO_BIN} -u "${MY_USERNAME}" "${@}" < /dev/stdin + ${SUDO_BIN} -u "${MY_USERNAME}" "${@}" < /dev/stdin || result="${?}" else - ${SUDO_BIN} -u "${MY_USERNAME}" "${@}" + ${SUDO_BIN} -u "${MY_USERNAME}" "${@}" || result="${?}" fi - result="${?}" - [[ "${result}" != "0" ]] && WHITESUR_COMMAND="${*}" return "${result}" diff --git a/lib-install.sh b/lib-install.sh index a09ed99..b11ec83 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -112,9 +112,11 @@ install_swupd_packages() { } prepare_install_apt_packages() { - sudo apt update -y; sudo apt install -y "${@}" + local status="1" - if [[ "${?}" == "100" ]]; then + 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 From db68bb721e3a0635966b34eafff427ec9ec037db Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Sat, 12 Jun 2021 10:31:40 +0700 Subject: [PATCH 29/40] Improve stability --- lib-core.sh | 8 ++++---- lib-install.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index 016b8bc..d4735ff 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -629,9 +629,9 @@ sudo() { fi if [[ -p /dev/stdin ]]; then - ${SUDO_BIN} "${@}" < /dev/stdin || result="${?}" + ${SUDO_BIN} "${@}" < /dev/stdin; result="${?}" else - ${SUDO_BIN} "${@}" || result="${?}" + ${SUDO_BIN} "${@}"; result="${?}" fi [[ "${result}" != "0" ]] && WHITESUR_COMMAND="${*}" @@ -649,9 +649,9 @@ udo() { fi if [[ -p /dev/stdin ]]; then - ${SUDO_BIN} -u "${MY_USERNAME}" "${@}" < /dev/stdin || result="${?}" + ${SUDO_BIN} -u "${MY_USERNAME}" "${@}" < /dev/stdin; result="${?}" else - ${SUDO_BIN} -u "${MY_USERNAME}" "${@}" || result="${?}" + ${SUDO_BIN} -u "${MY_USERNAME}" "${@}"; result="${?}" fi [[ "${result}" != "0" ]] && WHITESUR_COMMAND="${*}" diff --git a/lib-install.sh b/lib-install.sh index b11ec83..7f84095 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -114,7 +114,7 @@ install_swupd_packages() { prepare_install_apt_packages() { local status="1" - sudo apt update -y; sudo apt install -y "${@}" || status="${?}" + sudo apt update -y; sudo apt install -y "${@}"; status="${?}" if [[ "${status}" == "100" ]]; then prompt -w "\n APT: Your repo lists might be broken" From 4b916727b6ccee43ce216b7d0356b31fb416b46d Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Sat, 12 Jun 2021 10:37:11 +0700 Subject: [PATCH 30/40] Improve stability --- lib-core.sh | 10 +++++----- lib-install.sh | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index d4735ff..92eb676 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -620,7 +620,7 @@ remind_relative_path() { ############################################################################### sudo() { - local result="1" + local result="0" prompt -w "Executing '$(echo "${@}" | cut -c -35 )...' as root" @@ -629,9 +629,9 @@ sudo() { fi if [[ -p /dev/stdin ]]; then - ${SUDO_BIN} "${@}" < /dev/stdin; result="${?}" + ${SUDO_BIN} "${@}" < /dev/stdin || result="${?}" else - ${SUDO_BIN} "${@}"; result="${?}" + ${SUDO_BIN} "${@}" || result="${?}" fi [[ "${result}" != "0" ]] && WHITESUR_COMMAND="${*}" @@ -649,9 +649,9 @@ udo() { fi if [[ -p /dev/stdin ]]; then - ${SUDO_BIN} -u "${MY_USERNAME}" "${@}" < /dev/stdin; result="${?}" + ${SUDO_BIN} -u "${MY_USERNAME}" "${@}" < /dev/stdin || result="${?}" else - ${SUDO_BIN} -u "${MY_USERNAME}" "${@}"; result="${?}" + ${SUDO_BIN} -u "${MY_USERNAME}" "${@}" || result="${?}" fi [[ "${result}" != "0" ]] && WHITESUR_COMMAND="${*}" diff --git a/lib-install.sh b/lib-install.sh index 7f84095..caf9539 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -112,9 +112,9 @@ install_swupd_packages() { } prepare_install_apt_packages() { - local status="1" + local status="0" - sudo apt update -y; sudo apt install -y "${@}"; status="${?}" + sudo apt update -y; sudo apt install -y "${@}" || status="${?}" if [[ "${status}" == "100" ]]; then prompt -w "\n APT: Your repo lists might be broken" From 19f6fb2d775d180c906195b3b9ba43fa57a8ab8c Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Sat, 12 Jun 2021 14:01:28 +0700 Subject: [PATCH 31/40] Improve stability --- install.sh | 8 +++++--- lib-core.sh | 2 +- lib-install.sh | 30 +++++++++++++++++++----------- tweaks.sh | 4 +++- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/install.sh b/install.sh index 7aed090..6b87bfc 100755 --- a/install.sh +++ b/install.sh @@ -51,6 +51,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 @@ -117,8 +119,6 @@ if [[ "${uninstall}" == 'true' ]]; then remove_themes prompt -s "Done! All '${name}' themes has been removed." else - echo - if [[ "${interactive}" == 'true' ]]; then show_panel_opacity_dialog; show_sidebar_size_dialog; show_nautilus_style_dialog echo; prompt -w "DIALOG: '--size' and '--panel' parameters are ignored if exist."; echo @@ -152,6 +152,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 92eb676..a0aaba8 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -640,7 +640,7 @@ sudo() { } udo() { - local result="1" + 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 diff --git a/lib-install.sh b/lib-install.sh index caf9539..1d9fbd3 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -55,15 +55,23 @@ installation_sorry() { } prepare_deps() { - local head="$(curl -Is -o - 'time.cloudflare.com' || wget -Sq -o - --max-redirect=0 'time.cloudflare.com')" - local remote_time="$(echo "${head}" | awk -F ': ' '/Date/{print $2}')" - local remote_time_int="$(date --date "${remote_time}" +"%Y%m%d")" - local local_time_int="$(date -u +"%Y%m%d")" + local head="" + local remote_time="" + local local_time="" - if (( remote_time_int > local_time_int )); then - prompt -w "\n DEPS: Your system clock is wrong" - prompt -i "DEPS: Updating your system clock...\n" - sudo date -s "${remote_time}"; sudo hwclock --systohc + prompt -i "DEPS: Checking your internet connection..." + + if ! head="$(curl -Is -o - 'time.cloudflare.com' || wget -Sq -o - --max-redirect=0 'time.cloudflare.com')"; then + prompt -e "DEPS ERROR: You have an internet connection issue\n"; exit 1 + fi + + remote_time="$(echo "${head}" | awk -F ': ' '/Date/{print $2}' | date -f - "+%s")" + local_time="$(date -u "+%s")" + + if (( remote_time-(5*60) > local_time )); then + prompt -w "DEPS: Your system clock is wrong" + prompt -i "DEPS: Updating your system clock..." + sudo date -s "@${remote_time}"; sudo hwclock --systohc fi } @@ -142,7 +150,7 @@ prepare_xbps() { install_theme_deps() { if ! has_command glib-compile-resources || ! has_command sassc || ! has_command xmllint || (! is_my_distro "clear-linux" && [[ ! -r "/usr/share/gtk-engines/murrine.xml" ]]); then - prompt -w "'glib2.0', 'sassc', 'xmllint', and 'libmurrine' are required for theme installation." + prompt -w "DEPS: 'glib2.0', 'sassc', 'xmllint', and 'libmurrine' are required for theme installation." prepare_deps if has_command zypper; then @@ -174,7 +182,7 @@ install_theme_deps() { install_beggy_deps() { if ! has_command convert; then - prompt -w "'imagemagick' are required for background editing." + prompt -w "DEPS: 'imagemagick' is required for background editing." prepare_deps if has_command zypper; then @@ -202,7 +210,7 @@ install_beggy_deps() { install_dialog_deps() { if ! has_command dialog; then - prompt -w "'dialog' is required for this option." + prompt -w "DEPS: 'dialog' is required for this option." prepare_deps if has_command zypper; then diff --git a/tweaks.sh b/tweaks.sh index b2d1449..678e6a3 100755 --- a/tweaks.sh +++ b/tweaks.sh @@ -43,6 +43,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 @@ -137,7 +139,7 @@ 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..." From 36b65ede5104b6f560120763356445d402b0ef61 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Sat, 12 Jun 2021 15:58:03 +0700 Subject: [PATCH 32/40] Improve stability --- lib-core.sh | 4 ++-- lib-install.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index a0aaba8..51770e0 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -672,9 +672,9 @@ usage() { 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 + echo; prompt -i "Try '$0 --help' for more information."; echo; exit 1 fi } diff --git a/lib-install.sh b/lib-install.sh index 1d9fbd3..74eecdf 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -513,6 +513,7 @@ install_gdm_theme() { local TARGET= # Let's go! + install_theme_deps rm -rf "${WHITESUR_GS_DIR}"; install_beggy gtk_base "${colors[0]}" "${opacities[0]}" "${themes[0]}" From e063db1a348f62e06c6ac1a45ed4e5849d014cd0 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Sat, 12 Jun 2021 16:11:53 +0700 Subject: [PATCH 33/40] Correction --- tweaks.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tweaks.sh b/tweaks.sh index 678e6a3..63c58e2 100755 --- a/tweaks.sh +++ b/tweaks.sh @@ -175,6 +175,7 @@ else if [[ "${gdm}" == 'true' ]]; then echo; prompt -i "Installing '${name}' GDM theme..." + install_gdm_theme echo; prompt -s "Done! '${name}' GDM theme has been installed." fi From 4b4e22e220d8db2fa80b8dde98f88b67e9114c02 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Sat, 12 Jun 2021 22:45:49 +0700 Subject: [PATCH 34/40] Correction --- lib-install.sh | 3 +++ tweaks.sh | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib-install.sh b/lib-install.sh index 74eecdf..b51cec4 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -276,6 +276,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" } @@ -384,6 +385,8 @@ install_theemy() { echo -e "${desktop_entry}" > "${TARGET_DIR}/index.theme" + install_theme_deps + #--------------------GTK-3.0--------------------# mkdir -p "${TMP_DIR_T}" diff --git a/tweaks.sh b/tweaks.sh index 63c58e2..ce01337 100755 --- a/tweaks.sh +++ b/tweaks.sh @@ -43,8 +43,6 @@ 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 @@ -201,7 +199,7 @@ else 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." fi if [[ "${snap}" == 'true' ]]; then From 0f6c83755c34e0dfae082c32ae7b704462beee43 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Sun, 13 Jun 2021 06:54:01 +0700 Subject: [PATCH 35/40] Deprecate murrine --- src/main/gtk-2.0/common/main.rc | 20 -------------------- src/main/gtk-2.0/common/panel.rc | 8 -------- src/main/gtk-2.0/common/xfce-notify.rc | 21 --------------------- src/main/gtk-2.0/menubar-toolbar-dark.rc | 10 ---------- src/main/gtk-2.0/menubar-toolbar-light.rc | 11 ----------- 5 files changed, 70 deletions(-) diff --git a/src/main/gtk-2.0/common/main.rc b/src/main/gtk-2.0/common/main.rc index 4d04c36..d21517b 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" { 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..c27c9c3 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) diff --git a/src/main/gtk-2.0/menubar-toolbar-light.rc b/src/main/gtk-2.0/menubar-toolbar-light.rc index 9c562ec..bacb5f9 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 @@ -163,5 +154,3 @@ widget_class "*CajaNavigationWindow**" style "toolb # GtkCheckButton widget_class "**" style "toolbar_button" -widget_class "***" style "misc_button_label" - From ecd31aebcba9415146bad04d6def924f1f971faa Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Sun, 13 Jun 2021 06:59:11 +0700 Subject: [PATCH 36/40] Deprecate murrine --- README.md | 5 ----- lib-install.sh | 17 ++++++++--------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 0b89cae..fac385c 100644 --- a/README.md +++ b/README.md @@ -8,11 +8,6 @@ # Installation is easy!
Required dependencies info for nerds -### GTK2 theme deps -- gtk-murrine-engine `Fedora/RedHat` -- gtk2-engines-murrine `Ubuntu/Mint/Debian` -- gtk-engine-murrine `Arch/Manjaro` - ### "Install from source" deps - sassc - libglib2.0-dev-bin `ubuntu 20.04` diff --git a/lib-install.sh b/lib-install.sh index b51cec4..858b762 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -148,32 +148,31 @@ prepare_xbps() { #-----------------Deps-----------------# install_theme_deps() { - if ! has_command glib-compile-resources || ! has_command sassc || ! has_command xmllint || - (! is_my_distro "clear-linux" && [[ ! -r "/usr/share/gtk-engines/murrine.xml" ]]); then - prompt -w "DEPS: 'glib2.0', 'sassc', 'xmllint', and 'libmurrine' are required for theme installation." + 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 - sudo zypper in -y sassc glib2-devel gtk2-engine-murrine libxml2-tools + 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 - prepare_install_apt_packages sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils + prepare_install_apt_packages sassc libglib2.0-dev-bin libxml2-utils elif has_command dnf; then - sudo dnf install -y sassc glib2-devel gtk-murrine-engine libxml2 + sudo dnf install -y sassc glib2-devel libxml2 elif has_command yum; then - sudo yum install -y sassc glib2-devel gtk-murrine-engine libxml2 + sudo yum install -y sassc glib2-devel libxml2 elif has_command pacman; then # Rolling release # '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 - sudo pacman -Syyu --noconfirm --needed sassc glib2 gtk-engine-murrine libxml2 + 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 gtk-engine-murrine + prepare_xbps && sudo xbps-install -Sy sassc glib-devel else installation_sorry fi From f2f4240a3e17507ee80a3bbbadfc6d972159dae5 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Sun, 13 Jun 2021 09:37:09 +0700 Subject: [PATCH 37/40] Deprecate murrine --- lib-core.sh | 15 +++++++++++++++ lib-install.sh | 2 +- src/main/gtk-2.0/common/main.rc | 1 - src/main/gtk-2.0/menubar-toolbar-dark.rc | 3 --- src/main/gtk-2.0/menubar-toolbar-light.rc | 2 -- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index 51770e0..884084a 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -666,6 +666,21 @@ full_sudo() { fi } +get_http_response() { + exec 3<> "/dev/tcp/${1}/80" + echo -e "GET / HTTP/1.1\nHost: ${1}\n\n" >&3 + + ( + IFS="" + + while read -r -t 1 line 0<&3; do + echo "${line//$"\r"}" + done + ) + + exec 3<&- +} + usage() { prompt -e "Usage function is not implemented"; exit 1 } diff --git a/lib-install.sh b/lib-install.sh index 858b762..cc0bbe6 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -61,7 +61,7 @@ prepare_deps() { prompt -i "DEPS: Checking your internet connection..." - if ! head="$(curl -Is -o - 'time.cloudflare.com' || wget -Sq -o - --max-redirect=0 'time.cloudflare.com')"; then + if ! head="$(get_http_response 'time.cloudflare.com')"; then prompt -e "DEPS ERROR: You have an internet connection issue\n"; exit 1 fi diff --git a/src/main/gtk-2.0/common/main.rc b/src/main/gtk-2.0/common/main.rc index d21517b..d0a410d 100644 --- a/src/main/gtk-2.0/common/main.rc +++ b/src/main/gtk-2.0/common/main.rc @@ -2459,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/menubar-toolbar-dark.rc b/src/main/gtk-2.0/menubar-toolbar-dark.rc index c27c9c3..55d05ff 100644 --- a/src/main/gtk-2.0/menubar-toolbar-dark.rc +++ b/src/main/gtk-2.0/menubar-toolbar-dark.rc @@ -201,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 bacb5f9..9a22d7e 100644 --- a/src/main/gtk-2.0/menubar-toolbar-light.rc +++ b/src/main/gtk-2.0/menubar-toolbar-light.rc @@ -144,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" From 22bc88823a786acb400534177d4479da5d7e17fa Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Sun, 13 Jun 2021 21:47:00 +0700 Subject: [PATCH 38/40] Improve stability --- install.sh | 2 +- lib-core.sh | 21 ++++++++++--------- tweaks.sh | 58 ++++++++++++++++++++++++++--------------------------- 3 files changed, 42 insertions(+), 39 deletions(-) diff --git a/install.sh b/install.sh index 6b87bfc..6bd2eb3 100755 --- a/install.sh +++ b/install.sh @@ -143,7 +143,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}" diff --git a/lib-core.sh b/lib-core.sh index 884084a..1d9f9fb 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -667,18 +667,21 @@ full_sudo() { } get_http_response() { - exec 3<> "/dev/tcp/${1}/80" - echo -e "GET / HTTP/1.1\nHost: ${1}\n\n" >&3 + if exec 3<> "/dev/tcp/${1}/80"; then + echo -e "GET / HTTP/1.1\nHost: ${1}\n\n" >&3 - ( - IFS="" + ( + IFS="" - while read -r -t 1 line 0<&3; do - echo "${line//$"\r"}" - done - ) + while read -r -t 1 line 0<&3; do + echo "${line//$"\r"}" + done + ) - exec 3<&- + exec 3<&-; return 0 + else + exec 3<&-; return 1 + fi } usage() { diff --git a/tweaks.sh b/tweaks.sh index ce01337..1a399df 100755 --- a/tweaks.sh +++ b/tweaks.sh @@ -43,6 +43,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 @@ -140,85 +142,83 @@ if [[ "${uninstall}" == 'true' ]]; then 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..." + prompt -i "Installing '${name}' GDM theme..." install_gdm_theme - echo; prompt -s "Done! '${name}' GDM theme has been installed." + 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 -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 From a9f3d168a9e4c58257b3570cb0da73afc1e63ce8 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Mon, 14 Jun 2021 08:02:52 +0700 Subject: [PATCH 39/40] Improve stability --- lib-core.sh | 28 ++++++++++++++++++---------- lib-install.sh | 25 ++++++++++++++----------- 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index 1d9f9fb..8681b55 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -666,19 +666,27 @@ full_sudo() { fi } -get_http_response() { - if exec 3<> "/dev/tcp/${1}/80"; then - echo -e "GET / HTTP/1.1\nHost: ${1}\n\n" >&3 +get_utc_epoch_time() { + local time="" + local epoch="" - ( - IFS="" + 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 1 line 0<&3; do - echo "${line//$"\r"}" - done - ) + while read -r -t 2 line 0<&3; do + if [[ "${line}" =~ "Date:" ]]; then + time="${line#*':'}"; exec 3<&-; break + fi + done - exec 3<&-; return 0 + exec 3<&- + + if [[ "${time}" ]]; then + epoch="$(date -d "${time}" "+%s")" + echo "$((epoch + 2))" + else + return 1 + fi else exec 3<&-; return 1 fi diff --git a/lib-install.sh b/lib-install.sh index cc0bbe6..f6ac067 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -40,6 +40,10 @@ WHITESUR_SOURCE+=("lib-install.sh") # 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 @@ -55,23 +59,24 @@ installation_sorry() { } prepare_deps() { - local head="" local remote_time="" local local_time="" prompt -i "DEPS: Checking your internet connection..." - if ! head="$(get_http_response 'time.cloudflare.com')"; then + 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 - remote_time="$(echo "${head}" | awk -F ': ' '/Date/{print $2}' | date -f - "+%s")" - local_time="$(date -u "+%s")" - - if (( remote_time-(5*60) > local_time )); then + # 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..." - sudo date -s "@${remote_time}"; sudo hwclock --systohc + # Add "+ 25" here to accomodate potential time delay by sudo prompt + sudo date -s "@$((remote_time + 25))"; sudo hwclock --systohc fi } @@ -165,8 +170,6 @@ install_theme_deps() { sudo yum install -y sassc glib2-devel libxml2 elif has_command pacman; then # Rolling release - # '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 sudo pacman -Syyu --noconfirm --needed sassc glib2 libxml2 elif has_command xbps-install; then # Rolling release @@ -197,7 +200,7 @@ install_beggy_deps() { sudo yum install -y ImageMagick elif has_command pacman; then # Rolling release - sudo pacman -Syu --noconfirm --needed imagemagick + sudo pacman -Syyu --noconfirm --needed imagemagick elif has_command xbps-install; then # Rolling release prepare_xbps && sudo xbps-install -Sy ImageMagick @@ -225,7 +228,7 @@ install_dialog_deps() { sudo yum install -y dialog elif has_command pacman; then # Rolling release - sudo pacman -Syu --noconfirm --needed dialog + sudo pacman -Syyu --noconfirm --needed dialog elif has_command xbps-install; then # Rolling release prepare_xbps && sudo xbps-install -Sy dialog From 65f4feecbe096ebd1c3c90b8ae8ca74683b8ff98 Mon Sep 17 00:00:00 2001 From: Muhammad Rivan Date: Tue, 15 Jun 2021 20:15:34 +0700 Subject: [PATCH 40/40] Add silent mode --- install.sh | 7 +++++-- lib-core.sh | 20 ++++++++++++++++++++ lib-install.sh | 2 ++ tweaks.sh | 3 +++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 6bd2eb3..976f4a3 100755 --- a/install.sh +++ b/install.sh @@ -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" "" } @@ -67,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) @@ -77,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 ;; diff --git a/lib-core.sh b/lib-core.sh index 8681b55..6fb9b31 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -109,6 +109,7 @@ declare -A need_dialog=([-b]="false" [-s]="false" [-p]="false" [-d]="false" [-n] need_help="false" uninstall="false" interactive="false" +silent_mode="false" no_darken="false" no_blur="false" @@ -161,6 +162,8 @@ anim=( ############################################################################### start_animation() { + [[ "${silent_mode}" == "true" ]] && return 0 + setterm -cursor off ( @@ -181,6 +184,8 @@ start_animation() { } stop_animation() { + [[ "${silent_mode}" == "true" ]] && return 0 + [[ -e "/proc/${ANIM_PID}" ]] && kill -13 "${ANIM_PID}" setterm -cursor on } @@ -295,18 +300,27 @@ trap 'signal_abort' INT TERM TSTP ############################################################################### 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="" @@ -408,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" diff --git a/lib-install.sh b/lib-install.sh index f6ac067..63947a1 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -211,6 +211,8 @@ install_beggy_deps() { } install_dialog_deps() { + [[ "${silent_mode}" == "true" ]] && return 0 + if ! has_command dialog; then prompt -w "DEPS: 'dialog' is required for this option." prepare_deps diff --git a/tweaks.sh b/tweaks.sh index 1a399df..6e5577e 100755 --- a/tweaks.sh +++ b/tweaks.sh @@ -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" "" } @@ -59,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)