From 81d178644f4b12981451663869664a37c44aec27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20P=20M=C3=B6ller?= Date: Sun, 18 Aug 2019 17:11:13 -0400 Subject: [PATCH] trying lintian override --- data/upg-apply.desktop | 2 +- data/upg-notifier-autostart.desktop | 2 +- debian/changelog | 2 +- debian/control | 10 +- debian/copyright | 690 +----------------- debian/help2man.include | 3 + debian/lubuntu-update-notifier.manpages | 1 + .../lubuntu-upgrader.1} | 21 +- lubuntu-notifier.py | 149 ++++ lubuntu-upg-notifier.sh | 21 + lubuntu-upgrader | 355 +++++++++ setup.py | 4 +- 12 files changed, 563 insertions(+), 697 deletions(-) create mode 100644 debian/help2man.include create mode 100644 debian/lubuntu-update-notifier.manpages rename debian/{upgrader.manpages => manpages/lubuntu-upgrader.1} (51%) create mode 100755 lubuntu-notifier.py create mode 100755 lubuntu-upg-notifier.sh create mode 100755 lubuntu-upgrader diff --git a/data/upg-apply.desktop b/data/upg-apply.desktop index 6d1e91c..8bd617a 100644 --- a/data/upg-apply.desktop +++ b/data/upg-apply.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=lxqt-sudo upgrader --cache-update --full-upgrade +Exec=lxqt-sudo lubuntu-upgrader --cache-update --full-upgrade Name=Apply Full Upgrade GenericName=Apply Full Upgrade Comment=Search and Apply Full Upgrade diff --git a/data/upg-notifier-autostart.desktop b/data/upg-notifier-autostart.desktop index 2c1474a..f5d1b52 100644 --- a/data/upg-notifier-autostart.desktop +++ b/data/upg-notifier-autostart.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=/usr/lib/lubuntu-update-notifier/upg-notifier.sh +Exec=/usr/lib/lubuntu-update-notifier/lubuntu-upg-notifier.sh NoDisplay=true Name=upgNotifier Icon=system-software-update diff --git a/debian/changelog b/debian/changelog index 9d8c61b..39cffcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ lubuntu-update-notifier (0.1) UNRELEASED; urgency=medium - * Initial release. (Closes: #XXXXXX) + * Initial release. -- Hans P Möller Tue, 28 May 2019 16:42:14 -0400 diff --git a/debian/control b/debian/control index bf34324..8e190fc 100644 --- a/debian/control +++ b/debian/control @@ -21,6 +21,10 @@ Depends: aptdaemon, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends} -Description: Daemon which notifies about package updates - Opens a window when package updates are available. - It also allows one sudto do a full upgrade, aka dist-upgrade. +Description: Package includes a bash daemon (lubuntu-upg-notifier.sh) which + checks if there are updates available. If there are it opnes notifier.py which + is a window that notifies about package updates available. If you decide to + upgrade a full upgrade (not safe-upgrade) with the upgrader binary. + Upgrader can also be run alone, it can be chosen to run cache update before and + if a safe or full upgrade will be done. There is also a .desktop to call + upgrader with cache update and a full upgrade. diff --git a/debian/copyright b/debian/copyright index e62ec04..4d24511 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,674 +1,16 @@ -GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: https://phab.lubuntu.me/source/lubuntu-update-notifier/ + +Files: * +Copyright: © 2019 Lubuntu Team. + © 2019 Hans P Möller +License: GPL-2+ + +License: GPL-2+ + 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 2 of the + License, or (at your option) any later version. + . + On Debian systems, the full text of the GNU General Public License version + 2 can be found in the file `/usr/share/common-licenses/GPL-2'. diff --git a/debian/help2man.include b/debian/help2man.include new file mode 100644 index 0000000..7a6f882 --- /dev/null +++ b/debian/help2man.include @@ -0,0 +1,3 @@ +[authors] + .B lubuntu-upgrader + was primarily written by Hans P Möller. diff --git a/debian/lubuntu-update-notifier.manpages b/debian/lubuntu-update-notifier.manpages new file mode 100644 index 0000000..b9ea9c7 --- /dev/null +++ b/debian/lubuntu-update-notifier.manpages @@ -0,0 +1 @@ +debian/manpages/lubuntu-upgrader.1 diff --git a/debian/upgrader.manpages b/debian/manpages/lubuntu-upgrader.1 similarity index 51% rename from debian/upgrader.manpages rename to debian/manpages/lubuntu-upgrader.1 index ab7ac5e..c163f83 100644 --- a/debian/upgrader.manpages +++ b/debian/manpages/lubuntu-upgrader.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11. -.TH UPGRADER "1" "August 2019" "upgrader 0.1" "User Commands" +.TH LUBUNTU-UPGRADER "1" "August 2019" "lubuntu-upgrader 0.1" "User Commands" .SH NAME -upgrader \- manual page for upgrader 0.1 +lubuntu-upgrader \- lubuntu-upgrader is a GUI for system upgrade .SH SYNOPSIS -.B upgrader +.B lubuntu-upgrader [\fI\,options\/\fR] .SH OPTIONS .TP @@ -18,15 +18,6 @@ Update Cache Before Upgrade .TP \fB\-f\fR, \fB\-\-full\-upgrade\fR Full upgrade same as dist\-upgrade -.SH "SEE ALSO" -The full documentation for -.B upgrader -is maintained as a Texinfo manual. If the -.B info -and -.B upgrader -programs are properly installed at your site, the command -.IP -.B info upgrader -.PP -should give you access to the complete manual. +.SH AUTHORS + .B lubuntu-upgrader + was primarily written by Hans P M??ller. diff --git a/lubuntu-notifier.py b/lubuntu-notifier.py new file mode 100755 index 0000000..0306708 --- /dev/null +++ b/lubuntu-notifier.py @@ -0,0 +1,149 @@ +#!/usr/bin/python3 + +import sys +from PyQt5.QtWidgets import (QWidget, QApplication, QLabel, QPushButton, + QHBoxLayout, QVBoxLayout) +from PyQt5.QtCore import Qt +from PyQt5.QtGui import QIcon +from optparse import OptionParser +from pathlib import Path +import subprocess + + +class Dialog(QWidget): + def __init__(self, upgrades, security_upgrades, reboot_required, upg_path): + QWidget.__init__(self) + self.upgrades = upgrades + self.security_upgrades = security_upgrades + self.upg_path = upg_path + + self.initUI() + self.upgradeBtn.clicked.connect(self.call_upgrade) + self.closeBtn.clicked.connect(self.call_reject) + + def initUI(self): + self.label = QLabel() + self.label.setAlignment(Qt.AlignHCenter) + self.upgradeBtn = QPushButton("Upgrade") + self.closeBtn = QPushButton("Close") + text = "" + + hbox = QHBoxLayout() + hbox.addStretch(1) + hbox.addWidget(self.upgradeBtn) + hbox.addWidget(self.closeBtn) + hbox.addStretch(1) + + vbox = QVBoxLayout() + vbox.addWidget(self.label) + vbox.addLayout(hbox) + + if self.upg_path is None: + self.upgradeBtn.setVisible(False) + + self.setLayout(vbox) + self.setGeometry(300, 300, 500, 150) + self.setWindowTitle("Update Notifier") + self.center() + + if self.upgrades > 0: + text = "There are upgrades available. Do you want to do a system upgrade?\nThis will mean packages could be upgraded, installed, or removed." + + if reboot_required: + if text == "": + text = "Reboot is needed" + self.upgradeBtn.setVisible(False) + else: + text = text + "\nReboot is needed" + + self.label.setText(text) + + def center(self): + frameGm = self.frameGeometry() + screen = QApplication.desktop().screenNumber( + QApplication.desktop().cursor().pos()) + centerPoint = QApplication.desktop().screenGeometry(screen).center() + frameGm.moveCenter(centerPoint) + self.move(frameGm.topLeft()) + + def call_reject(self): + app.quit() + + def call_upgrade(self): + self.label.setText("Upgrading...") + # TODO maybe open another thread so notifier won't freeze + if self.upg_path == "terminal": + # cmd = ['qterminal', '-e', 'sudo', 'apt', 'dist-upgrade'] + cmd = ['qterminal', '-e', './upg.sh'] + else: + cmd = ['lxqt-sudo', self.upg_path, '--full-upgrade'] + # process = subprocess.Popen(self.upg_path) + # process = subprocess.Popen(cmd, shell=True) + self.upgradeBtn.setVisible(False) + self.upgradeBtn.setEnabled(False) + process = subprocess.Popen(cmd) + process.wait() + + '''options.fullUpgrade = 1 + dialogUpg = DialogUpg(optionss, pkg=self.packages) + dialogUpg.show()''' + + if self.upg_path == "terminal": + text = "Upgrade finished" + + reboot_required_path = Path("/var/run/reboot-required") + if reboot_required_path.exists(): + text = text + "\n" + "Restart required" + self.label.setText(text) + self.closeBtn.setVisible(True) + self.closeBtn.setEnabled(True) + + else: + app.quit() + + +class App(QApplication): + def __init__(self, upgrades, security_upgrades, reboot_required, upg_path, + *args): + QApplication.__init__(self, *args) + self.dialog = Dialog(upgrades, security_upgrades, reboot_required, + upg_path) + self.dialog.show() + + +def main(args, upgrades, security_upgrades, reboot_required, upg_path): + global app + app = App(upgrades, security_upgrades, reboot_required, upg_path, args) + app.setWindowIcon(QIcon.fromTheme("system-software-update")) + app.exec_() + + +if __name__ == "__main__": + parser = OptionParser() + parser.add_option("-p", + "--upgrader-sw", + dest="upg_path", + help="Define software/app to open for upgrade", + metavar="APP") + parser.add_option("-u", + "--upgrades", + dest="upgrades", + help="How many upgrades are available", + metavar="APP") + parser.add_option("-s", + "--security-upg", + dest="security_upgrades", + help="How many security upgrades are available", + metavar="APP") + + (options, args) = parser.parse_args() + + reboot_required_path = Path("/var/run/reboot-required") + if reboot_required_path.exists(): + reboot_required = True + else: + reboot_required = False + + if int(options.upgrades) > 0 or reboot_required: + main(sys.argv, int(options.upgrades), int(options.security_upgrades), + reboot_required, options.upg_path) diff --git a/lubuntu-upg-notifier.sh b/lubuntu-upg-notifier.sh new file mode 100755 index 0000000..4a91e42 --- /dev/null +++ b/lubuntu-upg-notifier.sh @@ -0,0 +1,21 @@ +#!/bin/sh +while true; + do + OUT=`/usr/lib/update-notifier/apt-check 2>&1` + #echo $OUT + oldIFS=$IFS + IFS=';' + j=0 + for STRING in $OUT; do + case $j in + 0) + UPG=$STRING;; + 1) + SEC=$STRING;; + esac + j=`expr $j + 1` + done + IFS=$oldIFS + /usr/lib/lubuntu-update-notifier/lubuntu-notifier.py -u $UPG -s $SEC -p /usr/bin/lubuntu-upgrader + sleep 3600 +done; diff --git a/lubuntu-upgrader b/lubuntu-upgrader new file mode 100755 index 0000000..0dc6de8 --- /dev/null +++ b/lubuntu-upgrader @@ -0,0 +1,355 @@ +#!/usr/bin/python3 +# deppend on +# aptdaemon +# debconf-kde-helper +import sys +import os +from PyQt5.QtWidgets import (QWidget, QApplication, QLabel, QPushButton, + QHBoxLayout, QVBoxLayout, QProgressBar, + QPlainTextEdit, QMessageBox) +from PyQt5.QtCore import Qt +from PyQt5.QtGui import QIcon, QTextCursor, QPalette +from optparse import OptionParser +from aptdaemon import client +from aptdaemon.errors import NotAuthorizedError, TransactionFailed +from aptdaemon.enums import (EXIT_SUCCESS, + EXIT_FAILED, + STATUS_COMMITTING, + get_error_description_from_enum, + get_error_string_from_enum, + get_status_string_from_enum) +from pathlib import Path + + +class DialogUpg(QWidget): + def __init__(self, options=None): + QWidget.__init__(self) + + self.initUI() + self.closeBtn.clicked.connect(self.call_reject) + self.apt_client = client.AptClient() + self.downloadText = "" + self.detailText = "" + self.old_short_desc = "" + self.details = "" + self.status = "" + self.errors = [] + # TODO make a terminal work to see more info + # self.master, self.slave = pty.openpty() + '''proc = subprocess.Popen(['qterminal'], + stdin=self.slave, + #stdout=subprocess.PIPE, + stdout=self.slave, + #stderr=subprocess.PIPE + stderr=self.slave)''' + + if options.fullUpgrade: + self.trans2 = self.apt_client.upgrade_system(safe_mode=False) + self.setWindowTitle('Full Upgrade') + else: + self.trans2 = self.apt_client.upgrade_system(safe_mode=True) + + if os.geteuid() == 0: + if options.cacheUpdate: + self.trans1 = self.apt_client.update_cache() + self.update_cache() + else: + self.upgrade() + + def initUI(self): + self.label = QLabel() + self.label.setAlignment(Qt.AlignHCenter) + self.closeBtn = QPushButton("Close") + self.progressBar = QProgressBar() + self.plainTextEdit = QPlainTextEdit() + palette = self.plainTextEdit.palette() + palette.setColor(QPalette.Base, Qt.black) + palette.setColor(QPalette.Text, Qt.gray) + self.plainTextEdit.setPalette(palette) + + hbox = QHBoxLayout() + hbox.addStretch(1) + hbox.addWidget(self.closeBtn) + hbox.addStretch(1) + + vbox = QVBoxLayout() + vbox.addWidget(self.label) + vbox.addWidget(self.progressBar) + vbox.addWidget(self.plainTextEdit) + vbox.addLayout(hbox) + + self.setLayout(vbox) + self.setGeometry(300, 300, 500, 150) + self.setWindowTitle('Upgrade') + self.progressBar.setVisible(False) + self.plainTextEdit.setReadOnly(True) + self.plainTextEdit.setVisible(False) + self.center() + + def center(self): + frameGm = self.frameGeometry() + screen = QApplication.desktop().screenNumber( + QApplication.desktop().cursor().pos()) + centerPoint = QApplication.desktop().screenGeometry(screen).center() + frameGm.moveCenter(centerPoint) + self.move(frameGm.topLeft()) + + def upgrade_progress(self, transaction, progress): + self.progressBar.setVisible(True) + self.progressBar.setValue(progress) + + def update_progress(self, transaction, progress): + self.progressBar.setVisible(True) + self.progressBar.setValue(progress) + self.label.setText("Updating cache...") + + def update_progress_download(self, transaction, uri, status, short_desc, + total_size, current_size, msg): + self.plainTextEdit.setVisible(True) + if self.old_short_desc == short_desc: + # if it's the same file we update the line, don't append new line + self.plainTextEdit.moveCursor(QTextCursor.End) + cursor = self.plainTextEdit.textCursor() + cursor.movePosition(QTextCursor.End, QTextCursor.MoveAnchor) + cursor.select(QTextCursor.LineUnderCursor) + cursor.removeSelectedText() + self.plainTextEdit.insertPlainText(str(current_size) + "/" + + str(total_size) + " " + msg) + cursor.movePosition(QTextCursor.End, QTextCursor.MoveAnchor) + else: + self.plainTextEdit.moveCursor(QTextCursor.End) + self.plainTextEdit.appendPlainText(status + " " + short_desc + + "\n") + self.plainTextEdit.insertPlainText(str(current_size) + "/" + + str(total_size) + " " + msg) + self.plainTextEdit.moveCursor(QTextCursor.End) + self.old_short_desc = short_desc + + def upgrade_progress_download(self, transaction, uri, status, short_desc, + total_size, current_size, msg): + self.plainTextEdit.setVisible(True) + if self.status == "status-downloading": + # TODO it prints the last line after installation is complete. + if self.old_short_desc == short_desc: + # if it's the same file we update the line, don't append + self.plainTextEdit.moveCursor(QTextCursor.End) + cursor = self.plainTextEdit.textCursor() + cursor.movePosition(QTextCursor.End, QTextCursor.MoveAnchor) + cursor.select(QTextCursor.LineUnderCursor) + cursor.removeSelectedText() + self.plainTextEdit.insertPlainText(str(current_size) + "/" + + str(total_size) + " " + + msg) + cursor.movePosition(QTextCursor.End, QTextCursor.MoveAnchor) + else: + self.plainTextEdit.moveCursor(QTextCursor.End) + self.plainTextEdit.appendPlainText(status + " " + short_desc + + "\n") + self.plainTextEdit.insertPlainText(str(current_size) + "/" + + str(total_size) + " " + + msg) + self.plainTextEdit.moveCursor(QTextCursor.End) + self.old_short_desc = short_desc + + def update_progress_detail(self, transaction, current_items, total_items, + current_bytes, total_bytes, current_cps, eta): + if total_items > 0: + self.plainTextEdit.setVisible(True) + if self.detailText != "Fetching " + str( + current_items) + " of " + str(total_items): + self.detailText = ( + "Fetching " + str(current_items) + " of " + + str(total_items) + ) + self.label.setText(self.detailText + "\n" + self.downloadText) + + def upgrade_progress_detail(self, transaction, current_items, total_items, + current_bytes, total_bytes, current_cps, eta): + if total_items > 0: + self.plainTextEdit.setVisible(True) + if self.detailText != "Downloaded " + str( + current_items) + " of " + str(total_items): + self.detailText = ( + "Downloaded " + str(current_items) + " of " + + str(total_items) + ) + self.label.setText(self.detailText + "\n" + self.downloadText) + + def upgrade_finish(self, transaction, exit_state): + if exit_state == EXIT_FAILED: + error_string = get_error_string_from_enum(transaction.error.code) + error_desc = get_error_description_from_enum( + transaction.error.code) + + text = "Upgrade finished" + + reboot_required_path = Path("/var/run/reboot-required") + if reboot_required_path.exists(): + text = text + "\n" + "Restart required" + self.progressBar.setVisible(False) + + if(len(self.errors) > 0): + text = text + "\n With some Errors" + self.plainTextEdit.appendPlainText("Error Resume:\n") + for error in self.errors: + self.plainTextEdit.setEnabled(False) + self.plainTextEdit.insertPlainText(error + "\n") + self.plainTextEdit.insertPlainText(error_string + "\n") + self.plainTextEdit.insertPlainText(error_desc + "\n") + self.plainTextEdit.moveCursor(QTextCursor.End) + + self.label.setText(text) + self.closeBtn.setVisible(True) + self.closeBtn.setEnabled(True) + self.plainTextEdit.setEnabled(True) + + def upgrade_error(self, transaction, error_code, error_details): + self.plainTextEdit.setVisible(True) + self.errors.append("Eror Code: " + str(error_code)) + self.errors.append("Error Detail: " + error_details) + self.plainTextEdit.setVisible(True) + self.closeBtn.setEnabled(True) + print("ECode: " + str(error_code) + "\n") + print("EDetail: " + error_details + "\n") + + def upgrade_cancellable_changed(self, transaction, cancellable): + self.closeBtn.setEnabled(cancellable) + + def update_cache(self): + self.closeBtn.setVisible(False) + try: + self.trans1.connect('finished', self.update_finish) + + self.trans1.connect('progress-changed', self.update_progress) + self.trans1.connect('progress-details-changed', + self.update_progress_detail) + self.trans1.connect('progress-download-changed', + self.update_progress_download) + self.trans1.connect('error', self.upgrade_error) + self.trans1.connect("status-changed", self.status_changed) + # TODO make a terminal work to see more info + # self.trans1.set_terminal(os.ttyname(self.slave)) + + self.trans1.run() + + except (NotAuthorizedError, TransactionFailed) as e: + print("Warning: install transaction not completed successfully:" + + "{}".format(e)) + + def update_finish(self, transaction, exit_state): + self.label.setText("Update Cache Finished") + if exit_state == EXIT_FAILED: + error_string = get_error_string_from_enum(transaction.error.code) + error_desc = get_error_description_from_enum( + transaction.error.code) + self.plainTextEdit.setEnabled(False) + self.plainTextEdit.moveCursor(QTextCursor.End) + self.plainTextEdit.insertPlainText(error_string + "\n") + self.plainTextEdit.insertPlainText(error_desc + "\n") + self.plainTextEdit.moveCursor(QTextCursor.End) + self.plainTextEdit.setEnabled(True) + + self.upgrade() + + def status_changed(self, transaction, status): + self.status = status + self.label.setText("Status:" + get_status_string_from_enum(status)) + print("Status:" + get_status_string_from_enum(status) + " " + status + + "\n") + + def status_details_changed(self, transaction, details): + self.plainTextEdit.setVisible(True) + if self.details != details: + self.details = details + + if self.status != "status-downloading": + ''' + if "Downloading xxxxx" is handled by + upgrade_progress_download" in short_desc + ''' + self.plainTextEdit.appendPlainText(details) + self.plainTextEdit.moveCursor(QTextCursor.End) + self.label.setText(details) + else: + self.label.setText(self.detailText + "\n" + details) + # if is downloading put the "Downloaded x of y" text + # print("PTY:" + str(self.slave)) + print("Status Details:" + details) + + def upgrade(self): + try: + self.trans2.connect('progress-changed', self.upgrade_progress) + self.trans2.connect('cancellable-changed', + self.upgrade_cancellable_changed) + self.trans2.connect('progress-details-changed', + self.upgrade_progress_detail) + self.trans2.connect('progress-download-changed', + self.upgrade_progress_download) + self.trans2.connect('finished', self.upgrade_finish) + self.trans2.connect('error', self.upgrade_error) + self.trans2.connect("status-details-changed", + self.status_details_changed) + self.trans2.connect("status-changed", self.status_changed) + + # TODO make a terminal work to see more info + # self.trans2.set_terminal(os.ttyname(self.slave)) + + ''' + # TODO implement this + self.trans2.connect("medium-required", self._on_medium_required) + self.trans2.connect("config-file-conflict", + self._on_config_file_conflict) + remove_obsoleted_depends + ''' + self.trans2.set_debconf_frontend('kde') + self.trans2.run() + + except (NotAuthorizedError, TransactionFailed) as e: + print("Warning: install transaction not completed successfully:" + + "{}".format(e)) + + def call_reject(self): + app.quit() + + +class App(QApplication): + def __init__(self, options, *args): + QApplication.__init__(self, *args) + self.dialog = DialogUpg(options) + self.dialog.show() + + +def main(args, options): + global app + app = App(options, args) + app.setWindowIcon(QIcon.fromTheme("system-software-update")) + + # Check for root permissions + if os.geteuid() != 0: + text = "Please run this software with administrative rights." + text += "To do so, run this program with lxqt-sudo." + title = "Need administrative powers" + QMessageBox.critical(None, title, text) + sys.exit() + else: + app.exec_() + + +if __name__ == "__main__": + # check arguments + parser = OptionParser(usage='%prog [options]', + version='0.1',) + parser.add_option("-c", + "--cache-update", + action="store_true", + dest="cacheUpdate", + help="Update Cache Before Upgrade") + parser.add_option("-f", + "--full-upgrade", + action="store_true", + dest="fullUpgrade", + help="Full upgrade same as dist-upgrade") + (options, args) = parser.parse_args() + + # run it + main(sys.argv, options) diff --git a/setup.py b/setup.py index bc40b1c..701a0d7 100644 --- a/setup.py +++ b/setup.py @@ -8,8 +8,8 @@ setup( name="lubuntu-update-notifier", version="0.1", packages=['lubuntu-update-notifier'], - scripts=['upgrader'], + scripts=['lubuntu-upgrader'], data_files=[ ('lib/lubuntu-update-notifier/', - ['upg-notifier.sh', 'notifier.py'])] + ['lubuntu-upg-notifier.sh', 'lubuntu-notifier.py'])] )