From b9cf67e9e2cff48b87358a3ece2e22732b8bdbbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Mon, 9 Dec 2013 14:47:03 +0100
Subject: [PATCH] Handle all text/* and office documents the same way

---
 copy_to_final.sh            |  1 +
 fs/opt/groomer/functions.sh | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/copy_to_final.sh b/copy_to_final.sh
index b452544..9009e76 100755
--- a/copy_to_final.sh
+++ b/copy_to_final.sh
@@ -16,6 +16,7 @@ fi
 # prepare fs archive
 tar -cvpzf backup.tar.gz -C fs/ .
 tar -xzf backup.tar.gz -C ${CHROOT_PATH}/
+chown root:root ${CHROOT_PATH}/etc/sudoers
 cp deb/led ${CHROOT_PATH}/usr/sbin/led
 cp -rf midi ${CHROOT_PATH}/opt/
 
diff --git a/fs/opt/groomer/functions.sh b/fs/opt/groomer/functions.sh
index d90933a..f52a31f 100755
--- a/fs/opt/groomer/functions.sh
+++ b/fs/opt/groomer/functions.sh
@@ -19,6 +19,15 @@ error_handler(){
 
 trap error_handler ERR TERM INT
 
+office_n_txt(){
+    src_file=${1}
+    dst_file=${2}${1##$CURRENT_SRC}.html
+    temp=${2}/temp
+    ${LO} --headless --convert-to pdf --outdir "${temp}" "${src_file}"
+    ${PDF} --dest-dir=/ ${temp}/*.pdf ${dst_file}
+    rm -rf "${temp}"
+}
+
 copy(){
     src_file=${1}
     dst_file=${2}
@@ -29,8 +38,7 @@ copy(){
 # Plain text
 text(){
     echo Text file ${1}
-    # XXX: append .txt ?
-    copy ${1} ${2}${1##$CURRENT_SRC}
+    office_n_txt ${1} ${2}
 }
 
 # Multimedia
@@ -83,15 +91,11 @@ application(){
             # https://blogs.msdn.com/b/vsofficedeveloper/archive/2008/05/08/office-2007-open-xml-mime-types.aspx
             # http://plan-b-for-openoffice.org/glossary/term/mime-type
             echo "MS Office or ODF document"
-            temp=${2}/temp
-            mkdir "${temp}"
-            ${LO} --headless --convert-to pdf --outdir "${temp}" "${src_file}"
-            ${PDF} --dest-dir "${2}" ${temp}/*.pdf
-            rm -rf "${temp}"
+            office_n_txt ${src_file} ${2}
             ;;
         *xml*)
             echo "Got an XML"
-            text ${src_file} ${2}
+            office_n_txt ${src_file} ${2}
             ;;
         x-dosexec)
             echo "Win executable"
@@ -177,7 +181,6 @@ main(){
         echo -n "Processing ${file} (${mime})... " >> ${LOGFILE}
         case "${main_mime}" in
             "text")
-
                 text ${file} ${dest} || error_handler
                 ;;
             "audio")