diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 0f27cef..58639de 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1,7 +1,7 @@ #!/bin/bash ################################################################################ ################################################################################ -######################## AmRRON Setup Script v0.5.9.1 ######################## +######################## AmRRON Setup Script v0.5.9.2 ######################## ######################## Created by TB-14 ######################## ######################## 05 DEC 2019 ######################## ################################################################################ @@ -1980,6 +1980,7 @@ if [[ -f $HOME/.conkyrc ]]; then mv $HOME/.conkyrc $HOME/.conkyrc-$(date +%h%d).bak || { ERRCODE="Failed to backup old .conkyrc file"; errors; return; } fi + ### Move Conky.Config before size case statement since so much is shared --CS cat > $HOME/.conkyrc <<\EOF @@ -2042,7 +2043,7 @@ ${goto 175}${tztime America/New_York %A %m-%d-%y}\ ${alignr}${tztime Zulu %A %m-%d-%y} $alignc ${font Roboto:style=Medium:pixelsize=35} ${color grey}\ -${color D4AF37} BTC: ${execi 60 echo -n "$" ; curl -s https://api.coinbase.com/v2/prices/spot?currency=USD | grep -o [0-9][0-9][0-9][0-9][0-9].[0-9][0-9]} +${color D4AF37} BTC: ${execi 60 echo -n "$" ; curl -s https://api.coinbase.com/v2/prices/spot?currency=USD | grep -o [0-9][0-9][0-9][0-9].[0-9][0-9]} #Uptime:$color $uptime ${color1}${font Roboto Mono:style=Bold}\ SYSTEM$color $hr\ @@ -2212,7 +2213,7 @@ AmCON Status $color$font $hr ${color grey}${font Roboto Mono:style=Bold}${alignc}Currently at ${execi 300 wget -q -O - "https://amrron.com/net-resourcestools/amcon-amrron-communications-condition-level/ "|grep -m1 "AmCON-1\|AmCON-2\|AmCON-3\|AmCON-4\|AmCON-5" -o | head -n1} -${if_running piardopc}${color green}ARDOP ACTIVE${else}${color red}ARDOP INACTIVE${endif} +${if_running ardopc}${color green}ARDOP ACTIVE${else}${color red}ARDOP INACTIVE${endif} ${if_running pat http}${color green}PAT ACTIVE${else}${color red}PAT INACTIVE${endif} ]] EOF @@ -2229,6 +2230,9 @@ sed -i '/own_window_argb_visual/d' $HOME/.conkyrc || sed -i s/'desktop'/'normal'/ $HOME/.conkyrc || { ERRCODE="Failed to change own_window_type to normal for raspbian stability."; errors; return; } + +sed -i s/'ardopc'/'piardop'/ $HOME/.conkyrc || + { ERRCODE="Failed to change ardopc to piardop for raspbian status."; errors; return; } fi #### Find ethernet and wifi interfaces and update conkyrc --CS @@ -3633,8 +3637,11 @@ fi conkysetup) 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 on raspbian or create a desktop file in $HOME/.config/autostart/ to enable autostart of conky. \ +You can run conky by typing in a terminal: +conky & +Add @/usr/bin/conky to the \ +file /etc/xdg/lxsession/LXDE-pi/autostart on raspbian or in linux 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} @@ -3710,8 +3717,8 @@ exit 1 ################################################################################ set_screen_size -check_installed_programs -query_updates +#check_installed_programs +#query_updates primer_menu notify_sources_menu system_update_menu diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index 0133a67..e2e44e3 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -1,3 +1,11 @@ +# Version 0.5.9.2 + - Cleaned up some formatting issues. + - fixing conky ARDOP indication for Raspbian. + +# Version 0.5.9.1 + - Updated JS8Call function to pull more accurate download links when changed. + - Initial version checking changed for two digit version as currently listed on the website. Will need to make more flexible. + # Version 0.5.9 - Added Security Tools - GNU Privacy Assist