diff --git a/020_conky.sh b/020_conky.sh index cba0f24..c2d7056 100755 --- a/020_conky.sh +++ b/020_conky.sh @@ -39,19 +39,21 @@ apt-get install -y p7zip-full rsync imagemagick cd /var/tmp # build deps -apt-get install -y autotools-dev valac libgtk-3-dev libgee-0.8-dev libjson-glib-dev +apt-get install -y autotools-dev devscripts debhelper 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 +sed -i -e "s|\( realpath\).||" 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 +apt-get remove -y autotools-dev valac debhelper libgtk-3-dev libgee-0.8-dev libjson-glib-dev +apt-get autoremove # Run conky + theme on x startup. Points at the symlink in dotconky changed by theme mkdir -p ${DEST}/.xinitrc.d/ @@ -61,7 +63,9 @@ EOF # download example conky theme. mkdir -p ${DEST}/.conky -git clone https://git.devuan.org/cyteen/conky-xanimos ${DEST}/.conky/conky-xanimos +if [ ! -d ${DEST}/.conky/conky-xanimos ]; then + git clone https://git.devuan.org/cyteen/conky-xanimos ${DEST}/.conky/conky-xanimos +fi # Change conky symlink to point to our default theme. -ln -sr ${DEST}/.conky/conky-xanimos/conky_start.sh ${DEST}/.conky/conky-startup.sh +ln -sfr ${DEST}/.conky/conky-xanimos/conky_start.sh ${DEST}/.conky/conky-startup.sh