diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index eabdb23..4425ecf 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -2149,9 +2149,8 @@ Categories=Network;HamRadio;" > $HOME/Desktop/voacapgui.desktop || { ERRCODE="Failed to create desktop icon for VOACAP GUI"; errors; } if [[ ! -f $USERDIR/icons/voacaplIcon.png ]]; then - mkdir -p $USERDIR/icons && \ -wget -P $USERDIR/icons/ -N https://www.qsl.net/hz1jw/voacapl/downloads/voacaplIcon.png || - { ERRCODE="Failed to icon image for VOACAPGUI"; errors; } + mkdir -p $USERDIR/icons && cp $DIR/images/voacaplIcon.png $USERDIR/icons/ || + { ERRCODE="Failed to place icon image for VOACAPGUI"; errors; } fi fi @@ -2169,8 +2168,7 @@ Categories=Network;HamRadio;" > $HOME/Desktop/ardop-status.desktop || { ERRCODE="Failed to create desktop icon for ardop-status tool"; errors; } if [[ ! -f $USERDIR/icons/tnc_icon.png ]]; then - mkdir -p $USERDIR/icons && \ -wget -P $USERDIR/icons/ -N http://www.gencat.cat/llengua/appdelasetmana/img_app/2016_03_24_TNC/tnc_icon.png || + mkdir -p $USERDIR/icons && cp $DIR/images/tnc_icon.png $USERDIR/icons/ || { ERRCODE="Failed to icon image for ardop-status tool"; errors; } fi fi @@ -2190,9 +2188,8 @@ Categories=Network;Security;" > $HOME/Desktop/PTE.desktop || { ERRCODE="Failed to create desktop icon for PTE"; errors; } if [[ ! -f $USERDIR/icons/pte_icon.png ]]; then - mkdir -p $USERDIR/icons && wget --no-check-certificate -P $USERDIR/icons/ -N https://www.paranoia\ -works.mobi/ptepc/img/pte_icon.png || - { ERRCODE="Failed to icon image for PTE"; errors; } + mkdir -p $USERDIR/icons && cp $DIR/images/pte_icon.png $USERDIR/icons/ || + { ERRCODE="Failed to place icon image for PTE"; errors; } fi fi @@ -2210,9 +2207,8 @@ Categories=Network;Security;" > $HOME/Desktop/PFE.desktop || { ERRCODE="Failed to create desktop icon for PFE"; errors; } if [[ ! -f $USERDIR/icons/pfe_icon.png ]]; then - mkdir -p $USERDIR/icons && wget --no-check-certificate -P $USERDIR/icons/ -N https://www.paranoia\ -works.mobi/ssefepc/img/pfe_icon.png || - { ERRCODE="Failed to icon image for PFE"; errors; } + mkdir -p $USERDIR/icons && cp $DIR/images/pfe_icon.png $USERDIR/icons/ || + { ERRCODE="Failed to place icon image for PFE"; errors; } fi fi @@ -2244,10 +2240,8 @@ if hash gtkterm 2>/dev/null; then { ERRCODE="Failed to create desktop icon for GTKTerm"; errors; } if [[ ! -f $USERDIR/icons/gtkterm-icon.png ]]; then - mkdir -p $USERDIR/icons && wget -N http://icons.iconarchive.com/icons/\ -papirus-team/papirus-apps/256/gtkterm-icon.png && mv gtkterm-icon.png \ - $USERDIR/icons/ || - { ERRCODE="Failed to download icon image for GTKTerm"; errors; } + mkdir -p $USERDIR/icons && cp $DIR/images/gtkterm-icon.png $USERDIR/icons/ || + { ERRCODE="Failed to place icon image for GTKTerm"; errors; } fi fi @@ -2296,9 +2290,8 @@ Type=Application Categories=Network;Security;" > $HOME/Desktop/pybitmessage.desktop || { ERRCODE="Failed to create desktop icon for Bitmessage"; errors; } if [[ ! -f $USERDIR/icons/bitmessage.png ]]; then - mkdir -p $USERDIR/icons && wget -N https://wiki.bitmessage.org/images/f/f1/Bitmessagelogo-reduced.png && mv Bitmessagelogo-reduced.png \ - $USERDIR/icons/bitmessage.png || - { ERRCODE="Failed to download icon image for PyBitmessage"; errors; } + mkdir -p $USERDIR/icons && cp $DIR/images/bitmessage.png $USERDIR/icons/ || + { ERRCODE="Failed to place icon image for PyBitmessage"; errors; } fi fi @@ -2382,8 +2375,8 @@ if hash yaac 2>/dev/null; then { 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 YAAC"; errors; } + mkdir -p $USERDIR/icons && cp $DIR/images/yaaclogo.png $USERDIR/icons/ || + { ERRCODE="Failed to place icon image for YAAC"; errors; } fi fi @@ -2428,8 +2421,8 @@ Categories=Radio;" > $HOME/Desktop/chirp.desktop || if [[ ! -f $USERDIR/icons/chirp.png ]]; then - mkdir -p $USERDIR/icons && wget --no-check-certificate -O $USERDIR/icons/chirp.png -N https://user-images.githubusercontent.com/46135240/61046260-f7616a80-a3dc-11e9-9bb3-da248bcb73a9.png || - { ERRCODE="Failed to icon image for chirp"; errors; } + mkdir -p $USERDIR/icons && cp $DIR/images/chirp.png $USERDIR/icons/ || + { ERRCODE="Failed to place icon image for chirp"; errors; } fi fi @@ -2464,8 +2457,8 @@ Categories=Radio;" > $HOME/Desktop/commstat.desktop || fi if [[ ! -f $USERDIR/icons/commstat.jpg ]]; then - mkdir -p $USERDIR/icons && wget --no-check-certificate -O $USERDIR/icons/commstat.jpg -N https://amrron.com/wp-content/uploads/2023/02/JS8Call_Commstat_Data.jpg || - { ERRCODE="Failed to icon image for commstat"; errors; } + mkdir -p $USERDIR/icons && cp $DIR/images/commstat.jpg $USERDIR/icons/ || + { ERRCODE="Failed to place icon image for commstat"; errors; } fi fi diff --git a/changelogs/CHANGELOG-Setup-Script.md b/changelogs/CHANGELOG-Setup-Script.md index 88531d2..29fc2d4 100644 --- a/changelogs/CHANGELOG-Setup-Script.md +++ b/changelogs/CHANGELOG-Setup-Script.md @@ -6,6 +6,7 @@ - Check for internet access - AmRRON Forms filename change. - Auto import AmRRON PGP keys into kleopatra keyring. +- Moved icons to repo and set to copy to user directory. # Version 1.2.6.1 - Fixed failed to get QtTermTCP icon error. - Fixed CommstatOne failure diff --git a/images/bitmessage.png b/images/bitmessage.png new file mode 100644 index 0000000..4f2b76b Binary files /dev/null and b/images/bitmessage.png differ diff --git a/images/chirp.png b/images/chirp.png new file mode 100644 index 0000000..fe57c1a Binary files /dev/null and b/images/chirp.png differ diff --git a/images/commstat.jpg b/images/commstat.jpg new file mode 100644 index 0000000..29356f5 Binary files /dev/null and b/images/commstat.jpg differ diff --git a/images/gtkterm-icon.png b/images/gtkterm-icon.png new file mode 100644 index 0000000..05ded57 Binary files /dev/null and b/images/gtkterm-icon.png differ diff --git a/images/pfe_icon.png b/images/pfe_icon.png new file mode 100644 index 0000000..97ec281 Binary files /dev/null and b/images/pfe_icon.png differ diff --git a/images/pte_icon.png b/images/pte_icon.png new file mode 100644 index 0000000..0e3f4f4 Binary files /dev/null and b/images/pte_icon.png differ diff --git a/images/tnc_icon.png b/images/tnc_icon.png new file mode 100644 index 0000000..1ea26b4 Binary files /dev/null and b/images/tnc_icon.png differ diff --git a/images/voacaplIcon.png b/images/voacaplIcon.png new file mode 100644 index 0000000..c441333 Binary files /dev/null and b/images/voacaplIcon.png differ diff --git a/images/yaaclogo.png b/images/yaaclogo.png new file mode 100644 index 0000000..8568ef5 Binary files /dev/null and b/images/yaaclogo.png differ