From 49b20d2e28da2ec05abe46873a1efbe39c1b0686 Mon Sep 17 00:00:00 2001 From: TangoBravo14 Date: Sun, 24 Feb 2019 12:44:38 +0000 Subject: [PATCH] Version 0.5.4.1 -- Removed CPU cores from conky. Added option for conky autostart on Linux systems. --- AmRRON-Setup-Script.sh | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index d6e1265..cb942d8 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -2132,10 +2132,6 @@ ${color2}RAM :${color grey} $mem/$memmax\ ${color2}Swap:${color grey} $swap/$swapmax\ ${color1}${goto 240}$swapperc% ${goto 280}${swapbar 10,140} ${color2}Temp: ${color grey}${acpitemp}°C -${color white}CPU1: ${color1}${cpu cpu1}% ${cpubar cpu1 10,100}\ - ${color white}${goto 220}CPU2: ${color1}${cpu cpu2}% ${cpubar cpu2 10,100} -${color white}CPU3: ${color1}${cpu cpu3}% ${cpubar cpu3 10,100}\ - ${color white}${goto 220}CPU4: ${color1}${cpu cpu4}% ${cpubar cpu4 10,100} ${color2}/ ${color grey}\ ${goto 90}${fs_used /}/${fs_size /}${color}\ ${goto 250}${color grey}${color1}${fs_used_perc /}% ${fs_bar 10,120 /} @@ -3675,31 +3671,39 @@ fi conkysetup) -if [[ ${PLAT} = "Raspbian" ]]; then echo "Conky has been intalled and a configuration file created at $HOME/.conkyrc. \ You can run conky by typing in a terminal:\n\nconky &\n\nAdd @/usr/bin/conky to the \ -file /etc/xdg/lxsession/LXDE-pi/autostart to enable autostart of conky on the Pi. \ +file /etc/xdg/lxsession/LXDE-pi/autostart on raspbian or create a desktop file in $HOME/.config/autostart/ to enable autostart of conky. \ Would you like me to attempt to do this now?" | yad --image=/tmp/banner.png \ --text-info --wrap --center --button="No:0" --button="Enable Autostart:2" \ --title "Conky Autostart Setup." ${r} ${c} rc=$? if [[ $rc -eq 2 ]]; then - echo "@/usr/bin/conky" | sudo tee -a /etc/xdg/lxsession/LXDE-pi/autostart || + + if [[ ${PLAT} = "Raspbian" ]]; then + echo "@/usr/bin/conky -p 8 -d" | sudo tee -a /etc/xdg/lxsession/LXDE-pi/autostart || { ERRCODE="Failed to setup conky autostart"; errors; } + + else + +mkdir -p ~/.config/autostart +echo "[Desktop Entry] +Encoding=UTF-8 +Version=0.9.4 +Type=Application +Name=Conky +Comment=System Monitor +Exec=/usr/bin/conky -p 8 -d +StartupNotify=false +Terminal=false +Hidden=false" > $HOME/.config/autostart/conky.desktop || + { ERRCODE="Failed to setup conky autostart"; errors; } + fi -else -TITLE="Conky Autostart Setup." -TEXT="Conky has been intalled and a configuration file created at $HOME/.conkyrc. \ -You can run conky by typing in a terminal: - -conky & - -If you would like to auto start conky on boot, please use your distribution's \ -Startup Applications setup and add conky to the list." - cleanupyad fi ;; - esac + +esac done