Pull image icon locally instead of from the web each time.

This commit is contained in:
tb14
2019-12-20 20:38:50 -08:00
parent 1288720c72
commit c94807bc42
6 changed files with 84 additions and 39 deletions
+12 -10
View File
@@ -1,9 +1,9 @@
#!/bin/bash
################################################################################
################################################################################
######################## AmRRON Setup Script v0.6.0 ########################
######################## AmRRON Setup Script v0.6.1 ########################
######################## Created by TB-14 ########################
######################## 07 DEC 2019 ########################
######################## 20 DEC 2019 ########################
################################################################################
################################################################################
#
@@ -1703,12 +1703,12 @@ if hash yaac 2>/dev/null; then
Icon=$USERDIR/icons/yaaclogo.png
Terminal=false
Type=Application
Categories=Network;HamRadio;" > $HOME/Desktop/js8call.desktop ||
Categories=Network;HamRadio;" > $HOME/Desktop/yaac.desktop ||
{ ERRCODE="Failed to create desktop icon for YAAC"; errors; }
if [[ ! -f $USERDIR/icons/yaaclogo.png ]]; then
mkdir -p $USERDIR/icons && wget -P $USERDIR/icons/ -N www.ka2ddo.org/ka2ddo/yaaclogo.png ||
{ ERRCODE="Failed to download icon image for GTKTerm"; errors; }
{ ERRCODE="Failed to download icon image for YAAC"; errors; }
fi
fi
@@ -2742,7 +2742,7 @@ yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --s
false "GTKTERM" "GTK based terminal - Recommended" "${GTKTERMVER}" \
false "PUTTY" "Popular graphical terminal" "${PUTTYVER}" \
false "DIREWOLF" "Soundcard TNC" "" \
false "YAAC" "Yet Another APRS Client **DISABLED FOR NOW**" "${YAACVER}" \
false "YAAC" "Yet Another APRS Client" "${YAACVER}" \
false "PACKET_GUIDE" "Creates a guide in $HOME/Documents with basic information to get you started with packet operations" \
${r} ${c} >>/tmp/results
rc=$?
@@ -3302,7 +3302,7 @@ cat /tmp/results | yad --text-info --center \
direwolf_install
;;
YAAC) echo "Skipping YAAC"
#yaac_install
yaac_install
;;
PACKET_GUIDE) echo "Creating Packet Radio Guide"
packet_guide
@@ -3390,7 +3390,7 @@ done < /tmp/results
function failure_handling() {
FAIL=$(cat /tmp/failures)
FAIL=$(cat /tmp/failures) || echo "No failures recorded"
if [[ -f /tmp/failures ]]; then
@@ -3455,7 +3455,9 @@ communications at this time."
TITLE="ARDOP configuration"
TEXT="A configuration file is required for your sound device to \
work with the ARDOP TNC.\n\nThis file is located at $HOME/.asoundrc
work with the ARDOP TNC.
This file is located at $HOME/.asoundrc
You may need to substitute the appropriate hardware location for your \
device.
@@ -3646,9 +3648,9 @@ TEXT="VOACAPL pythonprop GUI does not yet support Ubuntu 19.10."
pybitmessagesetup)
if [[ ${PLAT} = "Raspbian" ]]; then
echo --text "Add @/usr/local/bin/pybitmessage to the file /etc/xdg/lxsession/LXDE-pi/autostart \
echo "Add @/usr/local/bin/pybitmessage to the file /etc/xdg/lxsession/LXDE-pi/autostart \
to enable autostart of pybitmessage on the Pi. Would you like me to attempt to do this now?" | yad \
--image=$DIR/images/corps-icon.png --center --wrap \
--text-info --image=$DIR/images/corps-icon.png --center --wrap \
--button="No:0" --button="Enable Autostart:2" \
--title "PyBitmessage Autostart Setup." \
${r} ${c}