From e18102d5aea76af97b1ad316d49142f3141cd229 Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Thu, 3 May 2018 10:23:31 +0200
Subject: [PATCH] Various fixes

---
 files/apt/60-libreoffice | 2 +-
 install.sh               | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/files/apt/60-libreoffice b/files/apt/60-libreoffice
index 2ac3c54..2ecfef3 100644
--- a/files/apt/60-libreoffice
+++ b/files/apt/60-libreoffice
@@ -1,3 +1,3 @@
-Package: libreoffice libreoffice-gtk3 libreoffice-l10n-fr
+Package: ~/libreoffice/
 Pin: release n=stretch-backports
 Pin-Priority: 991
diff --git a/install.sh b/install.sh
index 13bd2a0..6943391 100755
--- a/install.sh
+++ b/install.sh
@@ -82,22 +82,22 @@ create_fusioninv_conf () {
 }
 
 configure_drm(){
-    if [ -z "$(grep -o drm $INITRAMFS_CONF_FILE)" ] 
+    if [ -z "$(grep -o drm $INITRAMFS_CONF_FILE)" ]
     then
-        cat "drm" >> $INITRAMFS_CONF_FILE
+        echo "drm" >> $INITRAMFS_CONF_FILE
     else
         message "DRM already done " "warn"
     fi
     if [ -z "$(grep -o $1 $INITRAMFS_CONF_FILE)" ]
     then
-        cat "$1 modeset=1" >> $INITRAMFS_CONF_FILE
+        echo "$1 modeset=1" >> $INITRAMFS_CONF_FILE
     else
         message "$1 already done " "warn"
     fi
 }
 
 configure_grub (){
-    sed -E "s/^GRUB_CMDLINE_LINUX_DEFAULT=\"(.*)\"/GRUB_CMDLINE_LINUX_DEFAULT=\"\1 spash\"/g" ${GRUB_DEFAULT_CONF_FILE} >/dev/null
+    sed -Ei "s/^GRUB_CMDLINE_LINUX_DEFAULT=\"(.*)\"/GRUB_CMDLINE_LINUX_DEFAULT=\"\1 splash\"/g" ${GRUB_DEFAULT_CONF_FILE} >/dev/null
     update-grub2 2>/dev/null
 }