Fixes in the compile/install process.

compile.sh

@@ -5,9 +5,9 @@ mkdir build
 for p in data/po/*.po; do
   l=$(basename $p .po)
 	echo "Compiling $l language"
-	msgfmt $p -o build/$l.mo
+	msgfmt $p -o build/$l.mo || exit 1
 done
-intltool-merge po/ -d -u src/salix-live-installer.desktop.in build/salix-live-installer.desktop
+intltool-merge data/po/ -d -u data/salix-live-installer.desktop.in build/salix-live-installer.desktop || exit 1
 cat <<'EOF' > build/salix-live-installer
 #!/bin/sh
 python /usr/share/salix-live-installer/launcher.py "$@"

install.sh

@@ -9,24 +9,41 @@ if [ -z "$DESTDIR" ] || [ ! -d "$DESTDIR" ]; then
   exit 2
 fi
 VER=$(python -c "
-  import os
-  os.chdir('src')
-  import launcher as l
-  print l.__version__,
-  ")
-install -D -m 755 xsu $DESTDIR/usr/bin/
-install -D -m 755 build/salix-live-installer $DESTDIR/usr/sbin/
-install -D -m 644 build/salix-live-installer.desktop $DESTDIR/usr/share/applications/
+import os
+os.chdir('src')
+import launcher as l
+print l.__version__,
+")
+install -D -m 755 xsu $DESTDIR/usr/bin/xsu
+install -D -m 755 build/salix-live-installer $DESTDIR/usr/sbin/salix-live-installer
+install -D -m 644 build/salix-live-installer.desktop $DESTDIR/usr/share/applications/salix-live-installer.desktop
 for size in 24 64 128; do
-  install -D -m 644 icons/salix-live-installer-${size}.png $DESTDIR/usr/share/icons/hicolor/${size}x${size}/apps/salix-live-installer.png
-install -D -m 644 icons/salix-live-installer.svg $DESTDIR/usr/share/icons/hicolor/scalable/apps/
-for d in resources salix_live_installer salix_livetools_library
-  install -D -m 644 src/$d/*.py $DESTDIR/usr/share/salix-live-installer/$d/
-install -D -m 755 src/launcher.py $DESTDIR/usr/share/salix-live-installer/
+  install -D -m 644 data/icons/salix-live-installer-${size}.png $DESTDIR/usr/share/icons/hicolor/${size}x${size}/apps/salix-live-installer.png
+done
+install -D -m 644 data/icons/salix-live-installer.svg $DESTDIR/usr/share/icons/hicolor/scalable/apps/salix-live-installer.svg
+for d in salix_live_installer salix_livetools_library; do
+  for f in src/$d/*.py; do
+    install -D -m 644 $f $DESTDIR/usr/share/salix-live-installer/$d/$(basename $f)
+  done
+done
+for f in src/resources/*; do
+  install -D -m 644 $f $DESTDIR/usr/share/salix-live-installer/resources/$(basename $f)
+done
+install -D -m 755 src/launcher.py $DESTDIR/usr/share/salix-live-installer/launcher.py
+(
+  cd $DESTDIR/usr/share/salix-live-installer
+  echo "
+import sys
+from compiler import compileFile
+for f in sys.argv[1:]:
+  print '{0}c'.format(f)
+  compileFile(f)
+" | python -- - $(find . -type f -name '*.py')
+)
 for m in build/*.mo; do
   l=$(basename $m .mo)
 	install -D -m 644 $m $DESTDIR/usr/share/locale/$l/LC_MESSAGES/salix-live-installer.mo
 done
 for f in docs/*; do
-	install -D -m 644 $f $DESTDIR/usr/doc/salix-live-installer-$VER/
+	install -D -m 644 $f $DESTDIR/usr/doc/salix-live-installer-$VER/$(basename $f)
 done

src/salix_live_installer/gathergui.py

@@ -853,7 +853,7 @@ def get_main_partition_message(self, full_text):
         msg = '<span foreground="black" font_family="monospace">- {0} => /</span>'.format(part_name)
     else:
       if full_text:
-        msg = _("{device} will be formatted with {fs} and will be mounted as {mountpoint}.").format(device = "<b>{0}</b>".format(part_name), fs = "<b>{0}</b>".format(self.cfg.main_format), "<b>{0}</b>".format('/'))
+        msg = _("{device} will be formatted with {fs} and will be mounted as {mountpoint}.").format(device = "<b>{0}</b>".format(part_name), fs = "<b>{0}</b>".format(self.cfg.main_format), mountpoint = "<b>{0}</b>".format('/'))
       else:
         msg = '<span foreground="black" font_family="monospace">- {0} => / (<u>{1}</u>)</span>'.format(part_name, self.cfg.main_format)
     return msg