From d5d08049582676c4ac5a78d3b088c6bff8292ada Mon Sep 17 00:00:00 2001
From: Hugh Greenberg <hugegreenbug@gmail.com>
Date: Tue, 16 Jun 2015 21:39:28 -0600
Subject: [PATCH] Bug fixes

---
 distroshare-ubuntu-imager.sh            | 4 ++--
 ubiquity_frontend_gtk_dialog_size.patch | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/distroshare-ubuntu-imager.sh b/distroshare-ubuntu-imager.sh
index 34807a3..d0618a0 100755
--- a/distroshare-ubuntu-imager.sh
+++ b/distroshare-ubuntu-imager.sh
@@ -10,7 +10,7 @@
 
 #GPL2 License
 
-VERSION="1.0.14"
+VERSION="1.0.15"
 
 echo "
 ################################################
@@ -536,7 +536,7 @@ done
 rm -f "$CASPER_EXTRA_SCRIPT"
 
 echo "Uninstalling Ubiquity"
-apt-get -q=2 remove casper lupin-casper ubiquity
+apt-get -q=2 remove casper lupin-casper ubiquity user-setup
 
 if [ -n "$EXTRA_PKGS" ]; then
    echo "Removing extra packages from installed system"
diff --git a/ubiquity_frontend_gtk_dialog_size.patch b/ubiquity_frontend_gtk_dialog_size.patch
index 993aca8..01401b7 100644
--- a/ubiquity_frontend_gtk_dialog_size.patch
+++ b/ubiquity_frontend_gtk_dialog_size.patch
@@ -14,7 +14,7 @@
  
 +    #Re-format error messages so each line is at most 100 characters long
 +    def fix_msg_line_len(self, msg):
-+        '\n'.join(textwrap.wrap(msg, 100))
++        return '\n'.join(textwrap.wrap(msg, 100))
 + 
      def all_children(self, parent):
          if isinstance(parent, Gtk.Container):
@@ -23,7 +23,7 @@
              else:
                  txt = self.finished_label.get_label()
                  txt = txt.replace('${RELEASE}', misc.get_release().name)
-+            txt = fix_msg_line_len(txt)
++            txt = self.fix_msg_line_len(txt)
              self.finished_label.set_label(txt)
              with misc.raised_privileges():
                  with open('/var/run/reboot-required', "w"):
@@ -31,7 +31,7 @@
          self.set_busy_cursor(False)
          if not msg:
              msg = title
-+        msg = fix_msg_line_len(msg)
++        msg = self.fix_msg_line_len(msg)
          dialog = Gtk.MessageDialog(
              self.live_installer, Gtk.DialogFlags.MODAL,
              Gtk.MessageType.ERROR, Gtk.ButtonsType.OK, msg)
@@ -39,7 +39,7 @@
          self.set_busy_cursor(False)
          if not msg:
              msg = title
-+        msg = fix_msg_line_len(msg)
++        msg = self.fix_msg_line_len(msg)
          buttons = []
          for option in options:
              if use_templates: