Pre412 (#122)

* Fixed desktop entry

'Version=' refers to Version of Desktop Entry Specifications (see https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html), and not the version of Customizer itself. Note that "Entries that confirm with this version of the specification should use 1.0." Sorted most important fields according to example specification for clarity (Version, Type, Name).

* Fixed typo

In line 26, revised from 'does not exists' to 'does not exist'.

* Fixed typo

In line 24, revised from 'ISO does not exists' to 'ISO does not exist'.

* Fixed typo

In line 26, revised from 'Allwoing' to 'Allowing'.

* Fixed typo and lettercase

In line 55, revised 'does not exists' to 'does not exist'; Line 62 and 64, revised 'this mean that' to 'this means'; Line 211, revised 'Compressed Filesystem' to 'compressed filesystem' to match sentence style in following line 218 'filesystem size'.

* Fixed typo

In line 22, revised from 'avaialable' to 'available'.

* Fixed minor bug

The error messages were not being displayed; This fix is based on [this pull request on forked repo](b2020fd) by wjwwood. In line 48, revised from u'' to u'{}' instead of proposed u'{0}' to standardize code style in old stable repo (Both have been tested working in 14.04 host system).

* Update Contributors

Added 'wjwwood' who found a bug that cause error messages not being displayed. No changes made to hardcoded list in GUI, because 'Contributors' file is the original and up to date listing.

* Update to version 4.1.2

* Update ChangeLog

Author: clearkimura

ChangeLog

@@ -1,3 +1,13 @@
+## Customizer v4.1.2
+    + Implemented first 'proper' update by interim maintainer @clearkimura
+    + Initial commit based on code review (issue #119, ongoing)
+    * Updated Contributors (latest listing as August 2016)
+    * Fixed minor bug that cause error messages not being displayed (kamilion@b2020fd)
+    * Fixed various typos in src/* files
+    * Fixed desktop entry according to spec
+
+-- clearkimura <[email protected]> Sat, 10 Sep 2016 08:45:08 UTC
+
 ## Customizer v4.1.1 (as commit 207cad4)
     * Updated README.md
     * Updated Contributors (latest listing as March 2016)

Contributors

@@ -28,7 +28,7 @@ unknown <Shiki@prive-cc8aeae9a.(none)>
 
 **Git issues and pull requests**
 
-abrsdk, AndrieVorster, AwlsomeAlex, aymanim, bisrael8191, bkkcoins^, bmix, brylie, carlossoy, confido117, elacheche, fsfarah, GlassSources, gmstyle, Gubolin, gururea, hrasadi, Israphel, jmelton98, kalabantas, kamilion, kerroncheddie, kovica, luzam, LYF610400210, magowiz, mbnoimi, minwook-shin, mitsuzero, optrusty, OsdKnights, pguth, porst17, psycato, ranseyer, Rdrit, ShvonderSiN, ss4, sweeneyk, sylviette, thomasstevenson, tienvx, UriHerrera, wheatgluten, yassen-itlabs, zero0nee, zxuser,
+abrsdk, AndrieVorster, AwlsomeAlex, aymanim, bisrael8191, bkkcoins^, bmix, brylie, carlossoy, confido117, elacheche, fsfarah, GlassSources, gmstyle, Gubolin, gururea, hrasadi, Israphel, jmelton98, kalabantas, kamilion, kerroncheddie, kovica, luzam, LYF610400210, magowiz, mbnoimi, minwook-shin, mitsuzero, optrusty, OsdKnights, pguth, porst17, psycato, ranseyer, Rdrit, ShvonderSiN, ss4, sweeneyk, sylviette, thomasstevenson, tienvx, UriHerrera, wheatgluten, wjwwood, yassen-itlabs, zero0nee, zxuser,
 
 **Wiki contributors**
 

Makefile

@@ -1,4 +1,4 @@
-VERSION = 4.1.1 ($(GIT_VERSION))
+VERSION = 4.1.2 ($(GIT_VERSION))
 GIT_VERSION = $(shell $(GIT) rev-parse --short HEAD || echo stable)
 
 DESTDIR = 

data/customizer.desktop.in

@@ -1,10 +1,10 @@
 [Desktop Entry]
+Version=1.0
+Type=Application
 Name=Customizer
-Version=4.1.0
 Exec=@ELEVATOR@ @PREFIX@/sbin/customizer-gui
 Comment=Ubuntu based LiveCD ISO images remastering tool
 Icon=@PREFIX@/share/customizer/logo.png
-Type=Application
 Terminal=false
 StartupNotify=true
-Categories=System;
+Categories=System;

src/actions/rebuild.py

@@ -52,16 +52,16 @@ def main():
     message.sub_info('Doing sanity checks')
     lsb_file = misc.join_paths(config.FILESYSTEM_DIR, 'etc/lsb-release')
     if not os.path.isfile(lsb_file):
-        raise(message.exception(lsb_file + ' does not exists'))
+        raise(message.exception(lsb_file + ' does not exist'))
 
     isolinux_dir = misc.join_paths(config.ISO_DIR, 'isolinux')
     if not os.path.isdir(isolinux_dir):
         raise(message.exception(isolinux_dir + ' does not exist'))
 
     if misc.search_file('999:999', misc.join_paths(config.FILESYSTEM_DIR, 'etc/passwd')):
-        raise(message.exception('User with UID 999 exists, this mean that automatic login will fail'))
+        raise(message.exception('User with UID 999 exists, this means automatic login will fail'))
     elif misc.search_file('999:999', misc.join_paths(config.FILESYSTEM_DIR, 'etc/group')):
-        raise(message.exception('Group with GID 999 exists, this mean that automatic login will fail'))
+        raise(message.exception('Group with GID 999 exists, this means automatic login will fail'))
 
     casper_dir = misc.join_paths(config.ISO_DIR, 'casper')
     if not os.path.isdir(casper_dir):
@@ -208,7 +208,7 @@ def main():
     message.sub_info('SquashFS Compression parameters', compression_parameters)
 
     # Create the compressed filesystem
-    message.sub_info('Creating SquashFS Compressed Filesystem')
+    message.sub_info('Creating SquashFS compressed filesystem')
     make_squash_fs = ('mksquashfs', config.FILESYSTEM_DIR, \
         misc.join_paths(config.ISO_DIR, 'casper/filesystem.squashfs'), \
         '-wildcards', '-no-recovery', '-noappend', \

src/actions/xnest.py

@@ -19,7 +19,7 @@ def main():
             message.sub_debug('Session detected', xsession)
 
     if not xsession:
-        raise(message.exception('No session avaialable'))
+        raise(message.exception('No session available'))
 
     # FIXME: race condition between session and Xephyr - if session
     # starts before Xephyr it fails saying it does not find the DISPLAY

src/gui.py.in

@@ -45,7 +45,7 @@ def msg_warning(msg):
     QtGui.QMessageBox.warning(MainWindow, app.tr('Warning'), msg)
 
 def msg_critical(msg):
-    QtGui.QMessageBox.critical(MainWindow, app.tr('Critical'), u''.format(msg))
+    QtGui.QMessageBox.critical(MainWindow, app.tr('Critical'), u'{}'.format(msg))
 
 # limit instances to one
 lock = '/run/lock/customizer'