Merge pull request #60 from gaining/develop

Develop
gaining · May 24, 2018 · 5617106 · 5617106
2 parents 8c6097c + 6fecb1d
commit 5617106
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Resetter v2.2.1-stable
+# Resetter v2.2.2-stable
 ![alt tag](https://github.com/gaining/Resetter/blob/master/Resetter/resetter-screenshot.png)
 
 It is an application built with python and pyqt that will help to reset an Ubuntu, Linux-Mint, and some other distros to stock, without having to manually re-install by using a live usb/cd/dvd image. For the list of supported distros, please see the *Officially supported distros* section.
@@ -8,7 +8,23 @@ Download the deb files found [here](https://github.com/gaining/Resetter/releases
 
 1. `sudo apt install gdebi`
 2. `sudo gdebi add-apt-key_1.0-0.5_all.deb`
-3. `sudo gdebi resetter_2.2.1-stable_all.deb`
+3. `sudo gdebi resetter_2.2.2-stable_all.deb`
+
+
+# New video tutorial on how to make any debian based distro compatible with Resetter with [resetter-helper](https://github.com/gaining/ResetterHelper)
+
+[![](http://img.youtube.com/vi/5VfSvEryOWU/0.jpg)](http://www.youtube.com/watch?v=5VfSvEryOWU "compatible")
+
+
+# How to share your distro's manifest and userlist by creating a github pull request
+
+[![How to share your distro's manifest and userlist by creating a github pull request](http://img.youtube.com/vi/PExKj6wLq9U/0.jpg)](http://www.youtube.com/watch?v=PExKj6wLq9U "share")
+
+
+# To make Resetter fetch Ubuntu 18.04's user list and manifest for compatibility please see
+[![18.04 manifest and userlist](http://img.youtube.com/vi/PExKj6wLq9U/0.jpg)](http://www.youtube.com/watch?v=PExKj6wLq9U "update")
+
+
 
 # Official video tutorial - courtesy of *Byte of Linux*
 
@@ -17,7 +33,7 @@ Download the deb files found [here](https://github.com/gaining/Resetter/releases
 
 # Status
 
-- Version 2.2.1 supports virtually all debian based distros, a video demonstrating how to easily support your favourite debian based distro will be uploaded. I also hope to make it the last release of resetter that is based on python2.7 and pyqt4 next version will be based on their respective newer technologies and frameworks.
+- Version 2.2.2 supports virtually all debian based distros, a video demonstrating how to easily support your favourite debian based distro will be uploaded. I also hope to make it the last release of resetter that is based on python2.7 and pyqt4 next version will be based on their respective newer technologies and frameworks.
 - Working Project: Resetter-cli, a version of resetter that runs terminally.
 - Please check the [changelog](https://github.com/gaining/Resetter/blob/master/changelog) for more details.
 

diff --git a/Resetter/control/control b/Resetter/control/control
@@ -1,5 +1,5 @@
 Package: resetter
-Version: 2.2.1-stable
+Version: 2.2.2-stable
 Installed-Size: 1540
 Maintainer: gaining <[email protected]>
 Section: python

diff --git a/Resetter/control/md5sums b/Resetter/control/md5sums
@@ -1,18 +1,18 @@
-d0417f55b2be80c81396a3c94dc1fe13  usr/share/doc/resetter/changelog.gz
+d88079c6e6036297a14d189499846a84  usr/share/doc/resetter/changelog.gz
 ff8b2c5b3b785bdccba43c0d5c4d7ad4  usr/share/doc/resetter/copyright
 343ad895e19fc427e6838d58c0929e49  usr/share/applications/Resetter.desktop
 2d4e80f6eff50c865f45d5f0fa9a73fd  usr/share/icons/hicolor/48x48/apps/resetter.png
 2d4e80f6eff50c865f45d5f0fa9a73fd  usr/share/icons/hicolor/48x48/actions/resetter.png
 3ae12c8bfbe97b9d23a1ebbc5d25aa85  usr/share/polkit-1/actions/org.freedesktop.pkexec.resetter.policy
 e1e5b7bbf099f7236f5897741b1b3152  usr/bin/resetter
-af045ac2532cbf11f375ed0a550e0b7b  usr/lib/resetter/Resetter.py
+6bc58b5afe73bac2dfdfcc6a51ca64ed  usr/lib/resetter/Resetter.py
 0f235c68e491e319ed3287cac495a960  usr/lib/resetter/InstallMissingDialog.py
 c556e4c6fbdf1607fa10a173fe12d38c  usr/lib/resetter/EasyRepo.py
 af74f0fada73e8f76808d693e41eb2ce  usr/lib/resetter/AptProgress.py
-38fdce2ba996c5df898298583ded5db7  usr/lib/resetter/Tools.py
+258b90f673708bd2be45bf9cd58b5570  usr/lib/resetter/Tools.py
 6875b930bc2c000f93c039ad6e282cf3  usr/lib/resetter/EasyInstall.py
-74745ad1f2abc29f37e482e5dab8a0f1  usr/lib/resetter/LicenceDialog.py
-649da1de6ac215d5d37f1ec57f57c687  usr/lib/resetter/SetEnvironment.py
+e3b095e8b27238bd587cab8c15a1d061  usr/lib/resetter/LicenceDialog.py
+ad672f4c8bf627732b50ab4db30e8971  usr/lib/resetter/SetEnvironment.py
 c63abd6b7e36cb91da1ed2d8178f106c  usr/lib/resetter/PackageView.py
 4e9eadefdf1cbc865becaff14ca5d621  usr/lib/resetter/AboutPage.py
 aeddcec6822875c5b10a8941cd8c2a9e  usr/lib/resetter/Singleton.py

diff --git a/Resetter/usr/lib/resetter/LicenceDialog.py b/Resetter/usr/lib/resetter/LicenceDialog.py
@@ -8,7 +8,7 @@ class Licence(QtGui.QDialog):
     def __init__(self, parent=None):
         super(Licence, self).__init__(parent)
         self.resize(350, 300)
-        self.setWindowTitle("Licence")
+        self.setWindowTitle("License")
         licence_text = QtGui.QTextBrowser(self)
         close_button = QtGui.QPushButton(self)
         text = open('/usr/share/doc/resetter/copyright').read()

diff --git a/Resetter/usr/lib/resetter/Resetter.py b/Resetter/usr/lib/resetter/Resetter.py
@@ -424,7 +424,6 @@ def updateUserlists(self):
             browser.addheaders = [("User-agent", "Mozilla/5.0")]
             for link in browser.links():
                 if 'blob' in link.url:
-                    print link.base_url
                     fname = link.url.split('/')[-1]
                     file_data = urllib2.urlopen("https://raw.githubusercontent.com/gaining/Resetter/master/Resetter"
                                                 "/usr/lib/resetter/data/userlists/"+fname)
@@ -439,7 +438,6 @@ def updateUserlists(self):
             UsefulTools().showMessage("Done!", "Userlists directory has been updated",
                                       QtGui.QMessageBox.Information)
 
-
     def processManifest(self):
         try:
             self.logger.info("processing updated manifest...")

diff --git a/Resetter/usr/lib/resetter/SetEnvironment.py b/Resetter/usr/lib/resetter/SetEnvironment.py
@@ -46,8 +46,8 @@ def __init__(self):
         self.createDirs()
         os.chdir(self.directory)
 
-        self.manifest = ("manifests/{}").format(self.detectOS()[0])
-        self.userlist = ("userlists/{}").format(self.detectOS()[1])
+        self.manifest = 'manifests/{}'.format(self.detectOS()[0])
+        self.userlist = 'userlists/{}'.format(self.detectOS()[1])
         self.window_title = self.detectOS()[2]
         self.filesExist(self.manifest, self.userlist)
 

diff --git a/Resetter/usr/lib/resetter/Tools.py b/Resetter/usr/lib/resetter/Tools.py
@@ -8,7 +8,7 @@
 
 class UsefulTools(object):
     def __init__(self):
-        self.version = '2.2.1'
+        self.version = '2.2.2'
 
     def showMessage(self, title, message, icon, detail=None):  # Method for showing various message types to user
         self.msg = QtGui.QMessageBox()

diff --git a/changelog b/changelog
@@ -1,3 +1,21 @@
+resetter (2.2.2-stable) trusty; urgency=low
+
+  * misc improvements
+
+ -- gaining <[email protected]>  Thu, 24 May 2018 03:10:18 -0400
+
+
+resetter (2.2.1-stable) trusty; urgency=low
+
+  * misc improvements
+  * new feature, manifest updater
+  * new feature, userlist updater
+  * improvements in source editor
+  * manifest and userlist updates for new distros
+
+ -- gaining <[email protected]>  Tue, 22 May 2018 20:29:03 -0400
+
+
 resetter (2.2.0-stable) trusty; urgency=low
 
   * fixes issue where users are unable to login after a reset