From c8733ccaa36970e4a784d7023c6079315a5df079 Mon Sep 17 00:00:00 2001
From: Cyteen May <cyteen@ring-zero.co.uk>
Date: Thu, 27 Feb 2020 00:17:06 +0000
Subject: [PATCH] Fixes and comments.

---
 020_conky.sh | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/020_conky.sh b/020_conky.sh
index 8c370df..09c61c5 100755
--- a/020_conky.sh
+++ b/020_conky.sh
@@ -10,7 +10,7 @@ echo "Hidden folder conky is created if it is not there"
 
 #wget -q0- -O /tmp/tmp.zip https://dl.opendesktop.org/api/files/download/id/1465391516/137272-conky_grey.zip && unzip /tmp/tmp.zip && rm /tmp/tmp.zip
 
-wget -qO- -O /var/tmp/aurora.tar.gz http://downloads.sourceforge.net/project/auroraconkytheme/Aurora_v3.0.4.tar.gz && tar xzvf /var/tmp/aurora.tar.gz && mv Aurora/ ${DEST}/.conky && rm /var/tmp/aurora.tar.gz
+wget -qO- -O /var/tmp/aurora.tar.gz http://downloads.sourceforge.net/project/auroraconkytheme/Aurora_v3.0.4.tar.gz && tar xzf /var/tmp/aurora.tar.gz && mv Aurora/ ${DEST}/.conky && rm /var/tmp/aurora.tar.gz
 
 #cd /tmp
 #git clone https://github.com/maxiwell/conky-seamod
@@ -22,31 +22,39 @@ chmod u+s /usr/sbin/hddtemp
 chmod u+s /usr/sbin/dmidecode
 chmod u+s /usr/sbin/smartctl
 
-cd ${DEST}/.conkyrc.d/Aurora
+cd ${DEST}/.conky/Aurora
 
 echo "installing necessary fonts"
-[ -d "${DEST}/.fonts" ] || mkdir -p ${DEST}/".fonts"
-cp ./fonts/* ${DEST}/.fonts
-sudo chown $USER ${DEST}/.fonts
-sudo chmod 644 ${DEST}/.fonts/*
-fc-cache -fv
+[ -d "${DEST}"/.conky/fonts ] || mkdir -p "${DEST}"/.conky/fonts
+cp ./fonts/* ${DEST}/.conky/fonts
+#sudo chown $USER ${DEST}/.fonts
+#sudo chmod 644 ${DEST}/.fonts/*
+#fc-cache -fv
 
-sensors-detect
-service kmod restart
+#sensors-detect
+#service kmod restart
 
 echo "building conky-manager2" 
-apt-get install realpath p7zip-full rsync imagemagick
+apt-get install -y p7zip-full rsync imagemagick
 cd /var/tmp
-apt-get install valac libgtk-3-dev libgee-0.8-dev libjson-glib-dev
+
+# build deps
+apt-get install -y autotools-dev valac libgtk-3-dev libgee-0.8-dev libjson-glib-dev
 git clone https://github.com/zcot/conky-manager2
 cd conky-manager2
+
+# Adjust to accept current valac version
 sed -i -e 's,\(valac-\).*,valac/,' debian/control
 dch -R 
 dpkg-buildpackage -us -uc -b
 dpkg -i ../conky-manager_*deb
 apt-get -f install
 
+# Remove build deps
+apt-get remove -y autotools-dev valac libgtk-3-dev libgee-0.8-dev libjson-glib-dev
+
 # Run conky + theme on x startup. Points at the symlink in dotconky changed by theme
+mkdir -p ${DEST}/.xinitrc.d/
 cat > ${DEST}/.xinitrc.d/start_conky.sh << 'EOF'
 bash ${HOME}/.conky/conky-startup.sh
 EOF