From d4499c4cefdfcb181679231c7aa36aa8ccbdfa1d Mon Sep 17 00:00:00 2001
From: SolidHal <solidhal@users.noreply.github.com>
Date: Wed, 12 Sep 2018 20:38:20 -0500
Subject: [PATCH] Fixed #35, fixed a xfce power setting, working on live usb
 installer

---
 .../xfce-perchannel-xml/xfce4-power-manager.xml    |  6 +++---
 scripts/InstallScripts/InstallToUSB.sh             |  7 ++++++-
 scripts/buildDebianFs.sh                           | 14 ++++++++------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-power-manager.xml b/resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-power-manager.xml
index eb23e0e..a34b832 100644
--- a/resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-power-manager.xml
+++ b/resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-power-manager.xml
@@ -8,12 +8,12 @@
     <property name="brightness-on-battery" type="uint" value="9"/>
     <property name="brightness-level-on-battery" type="uint" value="100"/>
     <property name="dpms-on-battery-off" type="uint" value="15"/>
-    <property name="dpms-on-battery-sleep" type="uint" value="14"/>
+    <property name="dpms-on-battery-sleep" type="uint" value="0"/>
     <property name="blank-on-battery" type="int" value="10"/>
     <property name="blank-on-ac" type="int" value="0"/>
-    <property name="dpms-on-ac-sleep" type="uint" value="29"/>
+    <property name="dpms-on-ac-sleep" type="uint" value="0"/>
     <property name="dpms-on-ac-off" type="uint" value="30"/>
     <property name="inactivity-on-battery" type="uint" value="30"/>
     <property name="brightness-level-on-ac" type="uint" value="100"/>
   </property>
-</channel>
\ No newline at end of file
+</channel>
diff --git a/scripts/InstallScripts/InstallToUSB.sh b/scripts/InstallScripts/InstallToUSB.sh
index 34f335b..6e36dc1 100644
--- a/scripts/InstallScripts/InstallToUSB.sh
+++ b/scripts/InstallScripts/InstallToUSB.sh
@@ -2,4 +2,9 @@
 #!/bin/bash
 
 #Install PrawnOS to an external device, the first usb by default
-
+apt install -y parted
+parted /dev/sda \
+	print \
+	Fix \
+partx -s /dev/sda2
+resize2fs /dev/sda2
diff --git a/scripts/buildDebianFs.sh b/scripts/buildDebianFs.sh
index b97d097..6d328d8 100755
--- a/scripts/buildDebianFs.sh
+++ b/scripts/buildDebianFs.sh
@@ -64,13 +64,12 @@ create_image PrawnOS-Alpha-c201-libre-2GB.img $outdev 50M 40 $outmnt
 
 # install Debian on it
 export LC_ALL="en_US.UTF-8" #Change this as necessary if not US
+export LANGUAGE="en_US.UTF-8"
+export LANG="en_US.UTF-8"
 export DEBIAN_FRONTEND=noninteractive
-qemu-debootstrap --arch armhf stretch --include locales,init $outmnt http://deb.debian.org/debian
+qemu-debootstrap --arch armhf stretch --include locales,init --keyring=$build_resources/debian-archive-keyring.gpg $outmnt http://deb.debian.org/debian
 chroot $outmnt passwd -d root
 
-#Copy in the gpg key
-cp $build_resources/debian-archive-keyring.gpg /usr/share/keyrings/debian-archive-keyring.gpg
-
 #Place the config files and installer script and give them the proper permissions
 echo -n PrawnOS-Alpha > $outmnt/etc/hostname
 cp -R $install_resources/ $outmnt/InstallResources/
@@ -108,6 +107,9 @@ make -C build/linux-$KVER ARCH=arm INSTALL_MOD_PATH=$outmnt modules_install
 rm -f $outmnt/lib/modules/3.14.0/{build,source}
 install -D -m 644 build/open-ath9k-htc-firmware/target_firmware/htc_9271.fw $outmnt/lib/firmware/ath9k_htc/htc_9271-1.4.0.fw
 
-echo "DONE!"
-cleanup
 
+umount -l $outmnt > /dev/null 2>&1
+rmdir $outmnt > /dev/null 2>&1
+losetup -d $outdev > /dev/null 2>&1
+echo "DONE!"
+trap - INT TERM EXIT