From 202022c5a0ab1c9ed8c14442d0c2a6d656446aa2 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sun, 19 Jan 2020 14:28:03 -0700
Subject: [PATCH 1/4] Added perl-rename to build dependencies

---
 setup/linux/packages/dependencies | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup/linux/packages/dependencies b/setup/linux/packages/dependencies
index 4558e9eb..5600fec3 100644
--- a/setup/linux/packages/dependencies
+++ b/setup/linux/packages/dependencies
@@ -21,6 +21,7 @@ ntfs-3g
 openssh
 p7zip
 pango
+perl-rename
 progsreiserfs
 refind-efi
 rsync

From 1b473b1ab02b7487975018d9863221e4a067baa2 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sun, 19 Jan 2020 15:14:03 -0700
Subject: [PATCH 2/4] Fix pipes when run from hw-diags

---
 scripts/wk/hw/diags.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/wk/hw/diags.py b/scripts/wk/hw/diags.py
index 40b84e2e..9925dd27 100644
--- a/scripts/wk/hw/diags.py
+++ b/scripts/wk/hw/diags.py
@@ -1285,7 +1285,7 @@ def screensaver(name):
 
   # Switch pane to fullscreen and start screensaver
   tmux.zoom_pane()
-  exe.run_program(cmd, check=False, pipe=False)
+  exe.run_program(cmd, check=False, pipe=False, stderr=subprocess.PIPE)
   tmux.zoom_pane()
 
 

From 3f9ebedfb3c17251a2a40ff3a95361cd740c5302 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sun, 19 Jan 2020 15:14:30 -0700
Subject: [PATCH 3/4] Fixed Conky update script

---
 setup/linux/include_x/airootfs/etc/skel/.update_conky | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/linux/include_x/airootfs/etc/skel/.update_conky b/setup/linux/include_x/airootfs/etc/skel/.update_conky
index b97a86c1..914e00d8 100755
--- a/setup/linux/include_x/airootfs/etc/skel/.update_conky
+++ b/setup/linux/include_x/airootfs/etc/skel/.update_conky
@@ -26,7 +26,7 @@ sed -i -r "s/#Network//" "${CONFIG_NEW}"
 
 # Fix under i3
 if ! [[ "${I3SOCK:-}" == "" ]]; then
-  sed -i -r 's/(own_window_type)(.*)(desktop)/\1\2override/' "${CONKY_NEW}"
+  sed -i -r 's/(own_window_type)(.*)(desktop)/\1\2override/' "${CONFIG_NEW}"
 fi
 
 # Replace config if there were changes

From 661681b80697645f7a1146e3bd018d2607a58b21 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sun, 19 Jan 2020 15:49:16 -0700
Subject: [PATCH 4/4] Fix permission issues when running GSMARTControl

---
 .../linux/include_x/airootfs/etc/skel/.config/openbox/menu.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/openbox/menu.xml b/setup/linux/include_x/airootfs/etc/skel/.config/openbox/menu.xml
index d0131dc3..2d560235 100644
--- a/setup/linux/include_x/airootfs/etc/skel/.config/openbox/menu.xml
+++ b/setup/linux/include_x/airootfs/etc/skel/.config/openbox/menu.xml
@@ -16,7 +16,7 @@
             <execute>gparted</execute>
         </action> </item>
         <item label="GSmartControl"> <action name="Execute">
-            <execute>gsmartcontrol</execute>
+            <execute>gsmartcontrol_polkit</execute>
         </action> </item>
         <item label="Network Diagnostics"> <action name="Execute">
             <execute>urxvt -title "Network Diagnostics" -hold -e hw-diags-network</execute>