More customizations; custom bg, desktop settings

TODO

@@ -1,4 +1 @@
-- terminal, browser on desktop
-- theme: style "Clearlooks", icons "elementary Xfce"
-- nilmdb wallpaper, was "xubuntu-quantal.png"
-- try xubuntu 13.04
+- Try other Ubuntu/Xubuntu versions

customize-inner.sh

@@ -213,7 +213,6 @@ chown -R nilmdb:nilmdb /home/nilmdb/git
 # Create the initial database and streams by running the standalone
 # server as nilmdb, making the right nilmtool calls, and killing it.
 sudo -i -u nilmdb nilmdb-server -a 127.0.0.1 -p 18646 &
-SERVER=$!
 sleep 1
 nilmtool -u http://127.0.0.1:18646/ destroy -R "/data/*" || true
 nilmtool -u http://127.0.0.1:18646/ create /data/raw uint16_6
@@ -223,3 +222,62 @@ nilmtool -u http://127.0.0.1:18646/ create /data/prep-b float32_8
 nilmtool -u http://127.0.0.1:18646/ create /data/prep-c float32_8
 kill $!
 wait
+
+# Put some default desktop shortcuts in place
+mkdir -p /etc/skel/Desktop
+cp /usr/share/applications/exo-terminal-emulator.desktop /etc/skel/Desktop
+cp /usr/share/applications/exo-web-browser.desktop /etc/skel/Desktop
+
+# XFCE customizations
+cat > /usr/share/gconf/defaults/88_nilmdbuntu-settings <<"EOF"
+/desktop/gnome/interface/gtk_theme "Clearlooks"
+/desktop/gnome/interface/icon_theme "elementary-xfce"
+EOF
+
+XML=/etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+BG=/usr/share/xfce4/backdrops
+dpkg-divert --local --rename --add ${XML}
+cat >$XML <<"EOF"
+<?xml version="1.0" encoding="UTF-8"?>
+<channel name="xfce4-desktop" version="1.0">
+  <property name="desktop-icons" type="empty">
+    <property name="style" type="int" value="2"/>
+    <property name="file-icons" type="empty">
+      <property name="show-home" type="bool" value="true"/>
+      <property name="show-filesystem" type="bool" value="true"/>
+      <property name="show-removable" type="bool" value="true"/>
+      <property name="show-trash" type="bool" value="true"/>
+    </property>
+  </property>
+  <property name="backdrop" type="empty">
+    <property name="screen0" type="empty">
+      <property name="monitor0" type="empty">
+        <property name="image-path" type="string"
+         value="/usr/share/xfce4/backdrops/nilmdbuntu.png"/>
+        <property name="image-show" type="bool" value="true"/>
+        <property name="image-style" type="int" value="4"/>
+        <property name="color-style" type="int" value="0"/>
+        <property name="color1" type="array">
+          <value type="uint" value="43947"/>
+          <value type="uint" value="49858"/>
+          <value type="uint" value="55255"/>
+          <value type="uint" value="65535"/>
+        </property>
+      </property>
+      <property name="monitor1" type="empty">
+        <property name="image-path" type="string"
+         value="/usr/share/xfce4/backdrops/nilmdbuntu.png"/>
+        <property name="image-show" type="bool" value="true"/>
+        <property name="image-style" type="int" value="4"/>
+        <property name="color-style" type="int" value="0"/>
+        <property name="color1" type="array">
+          <value type="uint" value="43947"/>
+          <value type="uint" value="49858"/>
+          <value type="uint" value="55255"/>
+          <value type="uint" value="65535"/>
+        </property>
+      </property>
+    </property>
+  </property>
+</channel>
+EOF

customize.sh

@@ -23,7 +23,7 @@ cat >> ${ISO}/preseed/nilmdbuntu.seed <<"EOF"
 d-i preseed/late_command string \
     in-target rm /etc/ssh/ssh_host_*; \
     in-target dpkg-reconfigure openssh-server; \
-    in-target sed -i -s 's/quiet splash//g' /etc/default/grub; \
+    in-target sed -i -s -e 's/quiet splash//g' /etc/default/grub; \
     in-target update-grub; \
     echo "done"
 
@@ -42,9 +42,9 @@ sed -i -s \
     -e "s/Xubuntu/NilmDBuntu/g;" \
     -e "s/Kubuntu/NilmDBuntu/g;" \
     -e "s/Ubuntu/NilmDBuntu/g;" \
-    -e "s-preseed/xubuntu-preseed/nilmdbuntu-g;" \
-    -e "s-preseed/kubuntu-preseed/nilmdbuntu-g;" \
-    -e "s-preseed/ubuntu-preseed/nilmdbuntu-g;" \
+    -e "s,preseed/xubuntu,preseed/nilmdbuntu,g;" \
+    -e "s,preseed/kubuntu,preseed/nilmdbuntu,g;" \
+    -e "s,preseed/ubuntu,preseed/nilmdbuntu,g;" \
     ${ISO}/isolinux/txt.cfg ${ISO}/boot/grub/{grub,loopback}.cfg
 
 # Remove quiet and splash from boot command lines.  Easier than a
@@ -53,6 +53,7 @@ sed -i -s -e "s/ quiet splash//g;" \
     ${ISO}/isolinux/txt.cfg ${ISO}/boot/grub/{grub,loopback}.cfg
 
 # Run the customize-inner.sh script inside the chroot
+sudo cp nilmdbuntu.png ${FS}/usr/share/xfce4/backdrops/nilmdbuntu.png
 sudo cp customize-inner.sh ${FS}/root/customize-inner.sh
 sudo chmod +x ${FS}/root/customize-inner.sh
 ./enter.sh "cd /root ; ./customize-inner.sh"