diff --git a/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj b/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj index b3f71be1..f74638e6 100644 --- a/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj +++ b/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj @@ -74,10 +74,10 @@ - DistroLauncher-Appx_StoreKey.pfx + DistroLauncher-Appx_TemporaryKey.pfx False Auto - A0C8C23CC1F951B9DD8F056E719BDF880624EDEF + B925CD1CB477AD4E4E14A79631FA4BF7F44E17DF False x64 1 diff --git a/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj.filters b/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj.filters index 36dd0f00..c93d5f5d 100644 --- a/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj.filters +++ b/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj.filters @@ -196,6 +196,7 @@ + diff --git a/DistroLauncher-Appx/MyDistro.appxmanifest b/DistroLauncher-Appx/MyDistro.appxmanifest index 942bd2c5..a29cdfda 100644 --- a/DistroLauncher-Appx/MyDistro.appxmanifest +++ b/DistroLauncher-Appx/MyDistro.appxmanifest @@ -1,6 +1,6 @@  - + WLinux diff --git a/LICENSE.md b/LICENSE.md index 4e3f4749..ca57ff3c 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -46,6 +46,14 @@ WLinux original modifications on https://github.com/WhitewaterFoundry/WLinux: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE +wslutilities from https://github.com/wslutilities/wslu + +This is free software; you can redistribute it and/or modify +it under the terms of the GNU GPL version 3 or (at your option) any later version. +There is NO warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +https://www.gnu.org/licenses/gpl-3.0.en.html + Debian-based WSL template from https://salsa.debian.org/rhaist-guest/WSL/tree/master/DistroLauncher: MIT License @@ -118,562 +126,6 @@ Upstream WSL distro template from https://github.com/Microsoft/WSL-DistroLaunche OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE -winsw, from https://github.com/leleroyn/winsw: - - Copyright (c) 2010-2016 Kohsuke Kawaguchi, Sun Microsystems, Inc., CloudBees, Inc., Oleg Nenashev and other contributors - - 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. - -elevate, from https://github.com/jpassing/elevate/: - - Copyright (c) Johannes Passing - - 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. - - -PulseAudio, from https://www.freedesktop.org/wiki/Software/PulseAudio/Download/: - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -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 this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -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 -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser 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 Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "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 -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY 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 -LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - Also add information on how to contact you by electronic and paper mail. - - You should also get your employer (if you work as a programmer) or your - school, if any, to sign a "copyright disclaimer" for the library, if - necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - Portions from the GNU/Linux Debian distribution are licensed under the [following licenses](https://www.debian.org/legal/licenses/), copies of which can also be found in /usr/share/common-licenses/ on WLinux. diff --git a/ShellIntegration/Install.reg b/ShellIntegration/Install.reg deleted file mode 100644 index 60ee8820..00000000 Binary files a/ShellIntegration/Install.reg and /dev/null differ diff --git a/ShellIntegration/Uninstall.reg b/ShellIntegration/Uninstall.reg deleted file mode 100644 index 7633414e..00000000 Binary files a/ShellIntegration/Uninstall.reg and /dev/null differ diff --git a/create-targz-x64.sh b/create-targz-x64.sh index e13961ff..db3a3792 100755 --- a/create-targz-x64.sh +++ b/create-targz-x64.sh @@ -40,10 +40,6 @@ sudo cp $BUILDIR/linux_files/local.conf $TMPDIR/$DIST/etc/fonts/local.conf sudo cp $BUILDIR/linux_files/helpme $TMPDIR/$DIST/etc/helpme sudo cp $BUILDIR/linux_files/setup $TMPDIR/$DIST/etc/setup -sudo mkdir $TMPDIR/$DIST/opt/ShellIntegration -sudo cp $BUILDIR/linux_files/ShellIntegration/Install.reg $TMPDIR/$DIST/opt/ShellIntegration/Install.reg -sudo cp $BUILDIR/linux_files/ShellIntegration/Uninstall.reg $TMPDIR/$DIST/opt/ShellIntegration/Uninstall.reg - #make helpme and setup executable sudo chroot $DIST chmod 755 /etc/helpme sudo chroot $DIST chmod 755 /etc/setup diff --git a/linux_files/ShellIntegration/Install.reg b/linux_files/ShellIntegration/Install.reg deleted file mode 100644 index 60ee8820..00000000 Binary files a/linux_files/ShellIntegration/Install.reg and /dev/null differ diff --git a/linux_files/ShellIntegration/Uninstall.reg b/linux_files/ShellIntegration/Uninstall.reg deleted file mode 100644 index 7633414e..00000000 Binary files a/linux_files/ShellIntegration/Uninstall.reg and /dev/null differ diff --git a/linux_files/profile b/linux_files/profile index 3535362f..bcecffbb 100644 --- a/linux_files/profile +++ b/linux_files/profile @@ -42,11 +42,15 @@ export DISPLAY=:0 # enable external libgl export LIBGL_ALWAYS_INDIRECT=1 -# speed up some GUI apps +# speed up some GUI apps like gedit export NO_AT_BRIDGE=1 -# does .firstrun exist? if not, run setup and touch .firstrun +# alias wlinux helper apps +alias wlinux-setup='bash /etc/setup' +alias wlinux-help='bash /etc/helpme' + +# does .firstrun exist? if not, mention wlinux-setup and touch .firstrun if [ ! -f ~/.firstrun ]; then - /bin/bash /etc/setup + echo "Welcome to WLinux. Type 'wlinux-setup' to run the setup tool. You will only see this message once." touch ~/.firstrun fi diff --git a/linux_files/setup b/linux_files/setup index 495d2b35..5cc473de 100644 --- a/linux_files/setup +++ b/linux_files/setup @@ -1,60 +1,52 @@ #!/bin/bash -response="" +RESPONSE="" CURDUR="" TMPDIR="" -VERSION="1.1.20" +VERSION="1.1.21" # functions ## core functions function welcomeprompt { -echo -echo "Welcome to WLinux." -echo "Thank you for supporting sustainable independent open-source development." -echo -echo "WLinux comes with a core set of packages installed. This setup tool allows" -echo "you to install selected packages for WLinux and configure optional settings." -echo -echo "Additional packages are available via the apt package management system." -echo "To learn more about apt you should use man, try typing $ man apt" -echo +whiptail --title "Welcome to WLinux" --msgbox "Thank you for supporting sustainable independent open-source development.\n +WLinux comes with a core set of packages installed. This setup allows\ +you to install some selected packages for WLinux and configure optional settings. \ +Many more packages are available via the apt package management system.\n +To learn more about apt you should use man, try typing $ man apt\ +" 15 80 } function continueprompt { -read -r -p "Would you like to continue this setup tool? [Y/n] " response -if [[ "$response" =~ ^[yY]$ ]] || [[ -z $response ]] -then - echo "Let's get started setting up WLinux." +if (whiptail --title "Continue setup?" --yesno "Would you like to continue wlinux-setup?" 8 50) then + echo "Starting wlinux-setup." else - echo "Exiting..." - echo "You may run the script again any time by running: bash /etc/setup" + echo "Exiting wlinux-setup" + echo "You may run the script again any time by running: $ wlinux-setup" exit 0 fi } function updatescriptprompt { -read -r -p "Would you like to download and run an updated version of this setup? [y/N] " response -if [[ "$response" =~ ^([yY][eE][sS]|[yY])+$ ]] -then + +if (whiptail --title "Upgrade setup?" --yesno "Would you like to download and restart with the most recent version of this setup? This is recommended periodically to get new features and fixes." 10 75) then createtmp echo "Backing up old /etc/setup to /etc/setup.old" sudo cp /etc/setup /etc/setup.old - echo "Getting fresh setup from GitHub and copying over /etc/setup" + echo "Getting fresh setup from GitHub" wget https://raw.githubusercontent.com/WhitewaterFoundry/WLinux/master/linux_files/setup sudo cp setup /etc/setup echo "Cleaning up." rm ~/.firstrun clear - echo "WLinux will now close. Please re-open and the updated script will begin." - echo - read -p "Press ENTER to continue." - taskkill.exe /IM WLinux.exe + echo "Running updated wlinux-setup" + bash /etc/setup exit 0 else - echo "Continuing with built-in setup. If you encounter problems, try an updated setup." + whiptail --title "Release setup" --msgbox "Continuing with built-in setup. If you encounter problems, please try updating." 8 85 fi + } function securitypatches { @@ -63,69 +55,104 @@ echo "No WSL hotfixes required." } function createtmp { - echo "Saving current directory as CURDIR: $ CURDIR=\$(pwd)" + echo "Saving current directory as \$CURDIR" CURDIR=$(pwd) - echo "Creating temporary working directory and saving location as TMPDIR: $ TMPDIR=$(mktemp -d)" TMPDIR=$(mktemp -d) - echo "Going to temporary working directory: $ cd \$TMPDIR which is" $TMPDIR + echo "Going to \$TMPDIR: $TMPDIR" cd $TMPDIR } function cleantmp { - echo "Returning to our original directory: $ cd $CURDIR" + echo "Returning to $CURDIR" cd $CURDIR - echo "Cleaning up temporary working directory: $ sudo rm -r $TMPDIR" + echo "Cleaning up $TMPDIR" sudo rm -r $TMPDIR # need to add sudo here because git clones leave behind write-protected files } function byemessage { - echo "Setup is complete." - echo - echo "You may run the script again any time by running: $ bash /etc/setup" - echo - echo "You may open a browser link to get help any time by running: $ bash /etc/helpme" - echo - echo "Enjoy!" + whiptail --title "Setup is complete." --msgbox "You may run the setup script again any time by typing $ wlinux-setup\n\nYou may open a browser link to get help any time by typing: $ wlinux-help" 10 100 exit 0 } ## internationalization function languageprompt { -read -r -p "Would you like to configure additional languages? [y/N] " response -if [[ "$response" =~ ^[yY]$ ]] -then +if (whiptail --title "Language" --yesno "Would you like to configure for international languages?" 8 45) then echo "Running $ dpkg-reconfigure locales" sudo dpkg-reconfigure locales fi } -## package meta functions - - # list all package sets and the order they should be presented for optional install here - -function installpackages { -echo "Shells:" -installandsetshell -echo "Editors:" -neoviminstall -emacsinstall -echo "Enhancements:" -fzfinstall -explorerintegration -## package set functions -echo "Development Environment:" -pythoninstall -nodeinstall -goinstall -powershellinstall -echo "Cloud Tools:" -azurecliinstall -echo "GUI Applications:" -basicguiinstall -codeinstall -chromeinstall -hidpiconfig +## package index + +function installmenu { + +CHOICE=$( +whiptail --title "WLinux GUI Setup" --checklist --separate-output "Hand-curated add-ons:" 20 100 12 \ + "EXPLORER" "Enable right-click on folders in Windows Explorer to open them in WLinux" off \ + "SHELLS" "Install and configure default shells from bash, zsh, csh, and fish" off \ + "EDITORS" "Install text editors neovim, emacs, or Visual Studio Code (requires X)" off \ + "PYTHONPI" "Install Python 3.7 and download and install latest PyPi" off \ + "NODEJS" "Install Node.js and npm" off \ + "GO" "Install the latest Go" off \ + "RUBY" "Install Ruby using rbenv and optionally install Rails" off \ + "POWERSHELL" "Install PowerShell for Linux and Azure CLI tools" off \ + "GUI" "Install the basic libraries needed for most GUI apps" off \ + "LANGUAGE" "Change default language and keyboard setting in WSL" off 3>&1 1>&2 2>&3 +) + +echo "Selected:" $CHOICE + +if [[ $CHOICE == *"LANGUAGE"* ]] ; then + echo "LANGUAGE" + languageprompt +fi + +if [[ $CHOICE == *"EXPLORER"* ]] ; then + echo "EXPLORER" + explorerintegration +fi + +if [[ $CHOICE == *"SHELLS"* ]] ; then + echo "SHELLS" + installandsetshell +fi + +if [[ $CHOICE == *"EDITORS"* ]] ; then + echo "EDITORS" + editormenu +fi + +if [[ $CHOICE == *"PYTHON"* ]] ; then + echo "PYTHON" + pythoninstall +fi + +if [[ $CHOICE == *"NODE"* ]] ; then + echo "NODE" + nodeinstall +fi + +if [[ $CHOICE == *"GO"* ]] ; then + echo "GO" + goinstall +fi + +if [[ $CHOICE == *"RUBY"* ]] ; then + echo "RUBY" + rubyinstall +fi + +if [[ $CHOICE == *"POWERSHELL"* ]] ; then + echo "POWERSHELL" + powershellinstall + azurecliinstall +fi + +if [[ $CHOICE == *"GUI"* ]] ; then + echo "GUI" + basicguiinstall +fi } function updateupgrade { @@ -133,27 +160,44 @@ echo "Updating apt package index from repositories: $ sudo apt update" sudo apt update echo "Applying available package upgrades from repositories: $ sudo apt upgrade -y" sudo apt upgrade -y +echo "Removing unnecessary packages: $ sudo apt autoremove -y" +sudo apt autoremove -y } -# additional repos -function addrepos { -read -r -p "Would you like to enable the non-free and contrib Debian package repos? [y/N] " response -if [[ "$response" =~ ^[yY]$ ]] -then - echo "Enabling the non-free and contrib Debian repos in /etc/apt/sources.list" - sudo sh -c 'echo "deb https://deb.debian.org/debian/ stable non-free contrib" >> /etc/apt/sources.list' - sudo apt-get update -y +## submenus + +function editormenu { + +EDITORCHOICE=$( +whiptail --title "Editor Menu" --checklist --separate-output "Custom editors (nano and vi included):" 12 55 5 \ + "NEOVIM" "Neovim" off \ + "EMACS" "Emacs" off \ + "CODE" "Visual Studio Code (requires X)" off 3>&1 1>&2 2>&3 +) + +if [[ $EDITORCHOICE == *"NEOVIM"* ]] ; then + neoviminstall +fi + +if [[ $EDITORCHOICE == *"EMACS"* ]] ; then + emacsinstall +fi + +if [[ $EDITORCHOICE == *"CODE"* ]] ; then + codeinstall fi + } + ## package sets ### shells -function installandsetshell { +function installandsetshell () { +echo "Entering shell setup" options=("zsh" "fish" "csh") - prompt="Check a shell by entering it's corresponding number (again to uncheck, ENTER when done): " msg="" @@ -185,15 +229,16 @@ for i in ${!options[@]}; do if [ ${options[i]} = "zsh" ] then createtmp - echo "NOTE: After zsh is installed, type 'exit' and ENTER to return to the WLinux setup script." + whiptail --title "zsh" --msgbox "After zsh is installed and launched, type 'exit' and ENTER to return to wlinux-setup" 10 60 sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" - cleantmp + cleantmp fi if [ ${options[i]} = "fish" ] then createtmp - echo "NOTE: After fish is installed, type 'exit' and ENTER to return to the WLinux setup script." + whiptail --title "fish" --msgbox "After fish is installed and launched, type 'exit' and ENTER to return to wlinux-setup" 10 60 + echo "NOTE: " curl -L https://get.oh-my.fish | fish cleantmp fi @@ -231,27 +276,26 @@ fi ### editors function neoviminstall { -read -r -p "Would you like to download and install neovim? [y/N] " response -if [[ "$response" =~ ^[yY]$ ]] -then +if (whiptail --title "NEOVIM" --yesno "Would you like to download and install neovim?" 8 70) then echo "Installing a recent neovim and building tools from Debian testing: $ sudo apt -t testing install neovim build-essential" sudo apt -t testing install neovim build-essential -y +else + echo "Skipping NEOVIM" fi } function emacsinstall { -read -r -p "Would you like to download and install emacs? [y/N] " response -if [[ "$response" =~ ^[yY]$ ]] -then +if (whiptail --title "EMACS" --yesno "Would you like to download and install emacs?" 8 70) then echo "Installing emacs: $ sudo apt install emacs -y" sudo apt install emacs -y +else + echo "Skipping EMACS" fi } function codeinstall { -read -r -p "Would you like to download and install Microsoft Code? [y/N] " response -if [[ "$response" =~ ^[yY]$ ]] -then +if (whiptail --title "CODE" --yesno "Would you like to download and install Microsoft Code?" 8 70) then + echo "Installing CODE" createtmp echo "Downloading and unpacking Microsoft's apt repo key with curl and gpg" curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg @@ -263,6 +307,8 @@ then echo "Installing code with dependencies: $ sudo apt install code libxss1 libasound2 -y" sudo apt install code libxss1 libasound2 -y cleantmp +else + echo "Skipping CODE" fi } @@ -270,60 +316,43 @@ fi function basicguiinstall { -echo "Use of GUI applications on WLinux requires an X server running on Windows." +whiptail --title "Note about GUI Apps" --msgbox "Use of GUI applications on WLinux requires an X server running on Windows.\n\nExamples:\n\nX410\nVcXsrv\nXming" 15 60 -read -r -p "Would you like to view a link to X410 on the Microsoft Store? [y/N] " response -if [[ "$response" =~ ^[yY]$ ]] -then - echo "Running wslview " +if (whiptail --title "X410" --yesno "Would you like to view a link to X410 on the Microsoft Store?" 8 70) then + echo "Running $ wslview " wslview https://afflnk.microsoft.com/c/1291904/433017/7593?u=https%3A%2F%2Fwww.microsoft.com%2Fen-us%2Fp%2Fx410%2F9nlp712zmn9q%23activetab%3Dpivot%3Aoverviewtab +else + echo "Skipping X410" fi -read -r -p "Would you like to download and install a base set of libraries for GUI packages? [y/N] " response -if [[ "$response" =~ ^[yY]$ ]] -then +if (whiptail --title "GUI Libraries" --yesno "Would you like to view a base set of libraries for GUI applications?" 8 75) then + echo "Installing GUILIB" echo "$ apt install xclip gnome-themes-standard gtk2-engines-murrine dbus dbus-x11 -y" sudo apt install xclip gnome-themes-standard gtk2-engines-murrine dbus dbus-x11 -y - echo "Configuring dbus." + echo "Configuring dbus if you already had it installed. If not, you might see some errors, and that is okay." sudo sed -i 's$.*$tcp:host=localhost,port=0$' /etc/dbus-1/session.conf sudo sed -i 's$EXTERNAL$ANONYMOUS$' /etc/dbus-1/session.conf sudo sed -i 's$$$' /etc/dbus-1/session.conf +else + echo "Skipping GUILIB" fi -} - -function chromeinstall { -read -r -p "Would you like to download and install Google Chrome? (Note: Experimental) [y/N] " response -if [[ "$response" =~ ^[yY]$ ]] -then - createtmp - wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add - - sudo sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main " > /etc/apt/sources.list.d/googlechrome.list' - sudo apt update - sudo apt upgrade -y - sudo apt install google-chrome-stable -y - sudo rm /etc/apt/sources.list.d/googlechrome.list #chrome takes over it's own apt settings - cleantmp -fi -} -function hidpiconfig { -read -r -p "Would you like to configure Qt and GDK for HiDPI displays? (Note: Experimental) [y/N] " response -if [[ "$response" =~ ^[yY]$ ]] -then +if (whiptail --title "GUI Libraries" --yesno "Would you like to configure Qt and GDK for HiDPI displays? (Experimental)" 8 85) then + echo "Installing HiDPI" export QT_SCALE_FACTOR=2 export GDK_SCALE=2 sudo sh -c 'echo "QT_SCALE_FACTOR=2" >> /etc/profile' sudo sh -c 'echo "GDK_SCALE=2" >> /etc/profile' +else + echo "Skipping HiDPI" fi } - ### dev environments function pythoninstall { -read -r -p "Would you like to download and install Python 3.7, IDLE, and the pip package manager? [y/N] " response -if [[ "$response" =~ ^[yY]$ ]] -then +if (whiptail --title "PYTHON" --yesno "Would you like to download and install Python 3.7, IDLE, and the pip package manager?" 8 90) then + echo "Installing PYTHON" createtmp sudo apt update sudo apt -t testing install build-essential python3.7 python3.7-distutils idle-python3.7 -y @@ -332,37 +361,40 @@ then export PATH="$PATH:/home/~/.local/bin" pip3 install -U pip cleantmp +else + echo "Skipping PYTHON" fi } function nodeinstall { -read -r -p "Would you like to download and install nodejs and the npm package manager? [y/N] " response -if [[ "$response" =~ ^[yY]$ ]] -then +if (whiptail --title "NODE" --yesno "Would you like to download and install NodeJS using n and the npm package manager?" 8 80) then + echo "Installing NODE" createtmp - curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - - sudo apt install -t testing nodejs build-essential -y + sudo apt install n build-essential -y + sudo n latest + curl -0 -L https://npmjs.com/install.sh | sudo sh cleantmp - read -r -p "Would you like to download and install the optional Yarn package manager? [y/N] " response - if [[ "$response" =~ ^[yY]$ ]] - then + if (whiptail --title "YARN" --yesno "Would you like to download and install the Yarn package manager? (optional)" 8 80) then + echo "Installing YARN" createtmp curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list sudo apt-get update && sudo apt-get install yarn cleantmp + else + echo "Skipping YARN" fi +else + echo "Skipping NODE" fi } function goinstall { -read -r -p "Would you like to download and install the latest Go from Google? [y/N] " response -if [[ "$response" =~ ^[yY]$ ]] -then +if (whiptail --title "GO" --yesno "Would you like to download and install the latest Go from Google?" 8 70) then createtmp echo "Downloading Go using wget." - wget https://dl.google.com/go/go1.11.linux-amd64.tar.gz + wget https://dl.google.com/go/go1.11.1.linux-amd64.tar.gz echo "Unpacking tar binaries to /usr/local/go." sudo tar -C /usr/local -xzf go1.11.linux-amd64.tar.gz echo "Creating ~/go/ for your projects." @@ -376,13 +408,68 @@ then sudo sh -c 'echo "export GOPATH=$HOME/go/" >> /etc/profile' sudo sh -c 'echo "export PATH=$GOPATH/bin:$GOROOT/bin:/usr/local/go/bin:$PATH" >> /etc/profile' cleantmp +else + echo "Skipping GO" +fi +} + +function rubyinstall { + +if (whiptail --title "RUBY" --yesno "Would you like to download and install Ruby using rbenv?" 8 65) then + echo "Installing RUBY" + echo "Installing Ruby dependencies" + sudo apt-get -t testing install git-core curl zlib1g-dev build-essential libssl-dev libreadline-dev libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt1-dev libcurl4-openssl-dev software-properties-common libffi-dev -y + createtmp + + echo "Getting rbenv" + git clone https://github.com/rbenv/rbenv.git ~/.rbenv + + echo "Configuring rbenv" + export PATH="$HOME/.rbenv/bin:$PATH" + eval "$(rbenv init -)" + echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc + echo 'eval "$(rbenv init -)"' >> ~/.bashrc + source ~/.bashrc + + echo "Getting ruby-build" + git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build + + echo "Configuring ruby-build" + export PATH="$HOME/.rbenv/plugins/ruby-build/bin:$PATH" + echo 'export PATH="$HOME/.rbenv/plugins/ruby-build/bin:$PATH"' >> ~/.bashrc + source ~/.bashrc + + echo "Installing Ruby using rbenv" + rbenv install 2.5.1 --verbose + rbenv global 2.5.1 + echo "Checking ruby version" + ruby -v + echo "Installing bundler using gem" + gem install bundler + echo "Rehashing rbenv" + rbenv rehash + cleantmp +else + echo "Skipping RUBY" +fi + +if (whiptail --title "RAILS" --yesno "Would you like to download and install Rails from NodeJS?" 8 65) then + echo "Installing RAILS" + sudo apt-get -t testing install git-core curl zlib1g-dev build-essential libssl-dev libreadline-dev libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt1-dev libcurl4-openssl-dev software-properties-common libffi-dev + createtmp + nodeinstall + gem install rails -v 5.2.0 + rbenv rehash + cleantmp +else + echo "Skipping RAILS" fi } function powershellinstall { -read -r -p "Would you like to download and install Powershell? [y/N] " response -if [[ "$response" =~ ^[yY]$ ]] -then + +if (whiptail --title "POWERSHELL" --yesno "Would you like to download and install Powershell?" 8 70) then + echo "Installing POWERSHELL" createtmp curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg sudo cp microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg @@ -392,49 +479,63 @@ then sudo apt upgrade -y sudo apt install powershell -y cleantmp +else + echo "Skipping POWERSHELL" fi } ### enhancements function fzfinstall { -read -r -p "Would you like to download and install optional command line finder fzf? [y/N] " response -if [[ "$response" =~ ^[yY]$ ]] -then - createtmp + +if (whiptail --title "FZF" --yesno "Would you like to download and install command line finder fzf?" 8 80) then + echo "Installing FZF" + cd ~ git clone --depth 1 https://github.com/junegunn/fzf.git cd fzf ./install - cleantmp +else + echo "Skipping FZF" fi } function explorerintegration { -read -r -p "Would you like to enable Windows Explorer shell integration? [y/N] " response -if [[ "$response" =~ ^[yY]$ ]] -then +if (whiptail --title "EXPLORER" --yesno "Would you like to enable Windows Explorer shell integration?" 8 75) then echo "Enabling Windows Explorer shell integration." - cmd.exe /C 'mkdir C:\Temp\' - cp /opt/ShellIntegration/Install.reg /mnt/c/Temp/Install.reg - cmd.exe /C 'Reg import C:\Temp\Install.reg' - cmd.exe /C 'del C:\Temp\Install.reg' - cmd.exe /C 'rmdir C:\Temp' -else + createtmp + cat << 'EOF' >> Install.reg + Windows Registry Editor Version 5.00 + [HKEY_CURRENT_USER\Software\Classes\Directory\Background\shell\WLinux] + @="Open with WLinux" + [HKEY_CURRENT_USER\Software\Classes\Directory\Background\shell\WLinux\command] + @="wlinux.exe run \"cd $(wslupath '%V') && $(getent passwd $LOGNAME | cut -d: -f7)\"" + [HKEY_CURRENT_USER\Software\Classes\Directory\shell\WLinux] + @="Open with WLinux" + [HKEY_CURRENT_USER\Software\Classes\Directory\shell\WLinux\command] + @="wlinux.exe run \"cd $(wslupath '%V') && $(getent passwd $LOGNAME | cut -d: -f7)\"" +EOF + cp Install.reg $(wslupath -T)/Install.reg + cmd.exe /C "Reg import %TEMP%\Install.reg" + cleantmp + else echo "Disabling Windows Explorer shell integration." - cmd.exe /C 'mkdir C:\Temp\' - cp /opt/ShellIntegration/Install.reg /mnt/c/Temp/Uninstall.reg - cmd.exe /C 'Reg import C:\Temp\Uninstall.reg' - cmd.exe /C 'del C:\Temp\Uninstall.reg' - cmd.exe /C 'rmdir C:\Temp' + createtmp + cat << 'EOF' >> Uninstall.reg + Windows Registry Editor Version 5.00 + [-HKEY_CURRENT_USER\Software\Classes\Directory\Background\shell\WLinux] + [-HKEY_CURRENT_USER\Software\Classes\Directory\shell\WLinux] +EOF + cp Install.reg $(wslupath -T)/Uninstall.reg + cmd.exe /C "Reg import %TEMP%\Uninstall.reg" + cleantmp fi } ### cloud tools function azurecliinstall { -read -r -p "Would you like to download and install optional Azure cloud command line tools? [y/N] " response -if [[ "$response" =~ ^[yY]$ ]] -then +if (whiptail --title "AZURECLI" --yesno "Would you like to download and install optional Azure command line tools?" 8 85) then + echo "Installing AZURECLI" createtmp curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg sudo cp microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg @@ -445,19 +546,18 @@ then echo "Note: azure-cli install can appear to 'stall' at 16%, it is usually not broken, just taking a long time." sudo apt install azure-cli -y cleantmp +else + echo "Skipping AZURECLI" fi } # main welcomeprompt -updatescriptprompt continueprompt -languageprompt -updateupgrade +updatescriptprompt securitypatches -installpackages -addrepos +installmenu byemessage exit 0 diff --git a/linux_files/sources.list b/linux_files/sources.list index ecfb0ac5..ef2c14ef 100644 --- a/linux_files/sources.list +++ b/linux_files/sources.list @@ -1,4 +1,4 @@ -deb https://deb.debian.org/debian stable main +deb https://deb.debian.org/debian stable main contrib non-free # deb-src https://deb.debian.org/debian stable main deb https://deb.debian.org/debian stable-updates main @@ -10,7 +10,7 @@ deb http://security.debian.org/debian-security/ stable/updates main deb https://deb.debian.org/debian stretch-backports main # deb-src https://deb.debian.org/debian stretch-backports main -deb https://deb.debian.org/debian testing main +deb https://deb.debian.org/debian testing main contrib non-free # deb-src https://deb.debian.org/debian testing main deb https://apt.patrickwu.ml/ stable main