diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index 3047f9e..82658d5 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -60,7 +60,7 @@ sudo apt-get -y install yad || fi #Lets grab the AmRRON Banner. -wget -N http://s9756.storage.proboards.com/5619756/a/KWTGc2YscxSclVEeB5jD.png -O /tmp/banner.png +#wget -N http://s9756.storage.proboards.com/5619756/a/KWTGc2YscxSclVEeB5jD.png -O $DIR/images/corps-icon.png # Find the screen size. Will default to 800x480 if it can not be detected. @@ -95,6 +95,7 @@ SOURCE="${BASH_SOURCE[0]}" DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" #echo "$DIR" +#Set image location # Create a error function to make life easier later on @@ -452,7 +453,7 @@ echo "100% Complete" #Deterimine computer type. function noOS_Support() { - yad --image=/tmp/banner.png --center --no-buttons \ + yad --image=$DIR/images/corps-icon.png --center --no-buttons \ --title "INVALID OS DETECTED" \ --text "A valid OS was not detected.\n\nThis installer was designed for \ Debian based distros; specifically Raspbian Stretch, Linux Mint 18.3 / 19.1 and Ubuntu 18.04." \ @@ -462,18 +463,18 @@ Debian based distros; specifically Raspbian Stretch, Linux Mint 18.3 / 19.1 and } function maybeOS_Support() { - if (yad --image=/tmp/banner.png --center \ + if (yad --image=$DIR/images/corps-icon.png --center \ --title "Not Supported OS" \ --text "Your OS may be compatible with this installer but has not been \ tested.\n\nThis installer has been tested on Raspbian Stretch, Ubuntu \ 18.04, and Mint 18.3 / 19.1.\n\nWould you like to continue anyway?" ${r} ${c}) then - yad --image=/tmp/banner.png --center \ + yad --image=$DIR/images/corps-icon.png --center \ --title "Not Supported OS" \ --text "::: Did not detect perfectly supported OS but,\n\n \ ::: Continuing installation at user's own risk..." ${r} ${c} || { echo "exiting"; exit 1; } else - yad --image=/tmp/banner.png --center \ + yad --image=$DIR/images/corps-icon.png --center \ --title "Not Supported OS" \ --text "::: Exiting due to unsupported OS" ${r} ${c} exit 1 @@ -1409,7 +1410,7 @@ function create_icons() { function assign_directories() { -UNSETDIRS=$(yad --image=/tmp/banner.png --center --form --separator="|" \ +UNSETDIRS=$(yad --image=$DIR/images/corps-icon.png --center --form --separator="|" \ --title "Set Installed Directories" \ --field="Tip:TXT" "One or more of the Directory Variables have not been set. Likely due to running install icons by itself. @@ -2587,7 +2588,7 @@ fi function radio_installer() { #Set user install directory For Radio Tools. - UserDir=$(yad --image=/tmp/banner.png --center --radiolist --print-column=2 --separator="" \ + UserDir=$(yad --image=$DIR/images/corps-icon.png --center --radiolist --print-column=2 --separator="" \ --title "AmRRON Radio Tools Installer / Updater" \ --text "Select your desired installation folder for HAM Radio Programs." \ --list --wrap-width=200 --wrap-cols=3 \ @@ -2595,13 +2596,13 @@ function radio_installer() { true "Default" "Default location will be $HOME/Radio" \ false "Custom" "I wish to select my own location" \ ${r} ${c}) || - { yad --image=/tmp/banner.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c}; exit 1; } + { yad --image=$DIR/images/corps-icon.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c}; exit 1; } case ${UserDir} in Default) yad --center \ - --image=/tmp/banner.png \ + --image=$DIR/images/corps-icon.png \ --title "Radio Tools Directory" \ --text "You have selected $HOME/Radio as your installation directory" ${r} ${c} || { radio_installer; return; } @@ -2613,7 +2614,7 @@ function radio_installer() { ;; Custom) USERDIR=$(yad --center --form --separator="" --field="MDIR:MDIR" $HOME \ - --image=/tmp/banner.png \ + --image=$DIR/images/corps-icon.png \ --title "Radio Tools Directory" \ --text "Please select your desired directory or create a new one." ${r} ${c}) || { radio_installer; return; } @@ -2625,7 +2626,7 @@ function radio_installer() { -yad --image=/tmp/banner.png --center --checklist --print-column=2 --separator="" \ +yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --separator="" \ --title "Select Radio Programs" \ --text "Select the programs you would like to install" \ --list --wrap-width=150 --wrap-cols=3 \ @@ -2665,7 +2666,7 @@ rc=$? done elif [[ $rc == 1 ]]; then - yad --image=/tmp/banner.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c} + yad --image=$DIR/images/corps-icon.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c} exit 1 fi @@ -2677,7 +2678,7 @@ rc=$? function packet_installer() { #Set user install directory For Packet Tools. - PacketDir=$(yad --image=/tmp/banner.png --center --radiolist --print-column=2 --separator="" \ + PacketDir=$(yad --image=$DIR/images/corps-icon.png --center --radiolist --print-column=2 --separator="" \ --title "AmRRON Packet Tools Installer / Updater" \ --text "Select your desired installation folder for Packet Radio Programs." \ --list --wrap-width=200 --wrap-cols=3 \ @@ -2685,13 +2686,13 @@ function packet_installer() { true "Default" "Default location will be $HOME/Radio/Packet" \ false "Custom" "I wish to select my own location" \ ${r} ${c}) || - { yad --image=/tmp/banner.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c}; exit 1; } + { yad --image=$DIR/images/corps-icon.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c}; exit 1; } case ${PacketDir} in Default) yad --center \ - --image=/tmp/banner.png \ + --image=$DIR/images/corps-icon.png \ --title "Packet Tools Directory" \ --text "You have selected $HOME/Radio/Packet as your installation directory" ${r} ${c} || { packet_installer; return; } @@ -2702,7 +2703,7 @@ function packet_installer() { fi ;; Custom) - PACKETDIR=$(yad --image=/tmp/banner.png --center --form --separator="" --field="MDIR:MDIR" $HOME \ + PACKETDIR=$(yad --image=$DIR/images/corps-icon.png --center --form --separator="" --field="MDIR:MDIR" $HOME \ --title "Packet Tools Directory" \ --text "Please select your desired directory or create a new one." ${r} ${c}) || { packet_installer; return; } @@ -2713,7 +2714,7 @@ function packet_installer() { esac -yad --image=/tmp/banner.png --center --checklist --print-column=2 --separator="" \ +yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --separator="" \ --title "Select Packet Programs" \ --text "Select the packet programs you would like to install" \ --list --wrap-width=150 --wrap-cols=3 \ @@ -2738,7 +2739,7 @@ rc=$? done elif [[ $rc == 1 ]]; then - yad --image=/tmp/banner.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c} + yad --image=$DIR/images/corps-icon.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c} exit 1 fi @@ -2748,7 +2749,7 @@ rc=$? #### Other tools menu ### function other_installer(){ -yad --image=/tmp/banner.png --center --checklist --print-column=2 --separator="" \ +yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --separator="" \ --title "Select Other Programs" \ --text "Select the other programs you would like to install. RASPAP not included in 'Install All'" \ --list --wrap-width=150 --wrap-cols=3 \ @@ -2777,14 +2778,14 @@ rc=$? done elif [[ $rc == 1 ]]; then - yad --image=/tmp/banner.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c} + yad --image=$DIR/images/corps-icon.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c} exit 1 fi if grep -Fxq "CONKY" /tmp/results; then - CONKYSEL=$(yad --image=/tmp/banner.png --center --radiolist --print-column=2 --separator="" \ + CONKYSEL=$(yad --image=$DIR/images/corps-icon.png --center --radiolist --print-column=2 --separator="" \ --title "Conky Configuration" \ --text "Select the Conky Configuration you would like to install." \ --list --wrap-width=150 --wrap-cols=3 \ @@ -2804,7 +2805,7 @@ fi function security_installer() { #Set user install directory For Security Tools. - SecDir=$(yad --image=/tmp/banner.png --center --radiolist --print-column=2 --separator="" \ + SecDir=$(yad --image=$DIR/images/corps-icon.png --center --radiolist --print-column=2 --separator="" \ --title "AmRRON Packet Security Installer / Updater" \ --text "Select your desired installation folder for Security Programs." \ --list --wrap-width=200 --wrap-cols=3 \ @@ -2818,7 +2819,7 @@ function security_installer() { case ${SecDir} in Default) yad --center \ - --image=/tmp/banner.png \ + --image=$DIR/images/corps-icon.png \ --title "Security Tools Directory" \ --text "You have selected $HOME/Security as your installation directory" ${r} ${c} || { security_installer; return; } @@ -2829,7 +2830,7 @@ function security_installer() { fi ;; Custom) - SECDIR=$(yad --image=/tmp/banner.png --center --form --separator="" --field="MDIR:MDIR" $HOME \ + SECDIR=$(yad --image=$DIR/images/corps-icon.png --center --form --separator="" --field="MDIR:MDIR" $HOME \ --title "Security Tools Directory" \ --text "Please select your desired directory or create a new one." ${r} ${c}) || { security_installer; return; } @@ -2840,7 +2841,7 @@ function security_installer() { esac -yad --image=/tmp/banner.png --center --checklist --print-column=2 --separator="" \ +yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --separator="" \ --title "Select Security Programs" \ --text "Select the security programs you would like to install. Wireless modifications will not be selected with 'Install All'" \ --list --wrap-width=150 --wrap-cols=3 \ @@ -2872,7 +2873,7 @@ rc=$? done elif [[ $rc == 1 ]]; then - yad --image=/tmp/banner.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c} + yad --image=$DIR/images/corps-icon.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c} exit 1 fi @@ -2905,13 +2906,13 @@ commands. You will be asked for your password in the terminal to perform some \ tasks but you should not run the entire program as Root. " | yad \ ---image=/tmp/banner.png \ +--image=$DIR/images/corps-icon.png \ --text-info \ --wrap \ --center \ --title "Welcome to the AmRRON Installer / Updater." \ ${r} ${c} || -{ yad --image=/tmp/banner.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c}; exit 1; } +{ yad --image=$DIR/images/corps-icon.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c}; exit 1; } } @@ -2922,7 +2923,7 @@ attempting builds of HAMLIB or the FLDIGI Suite of programs. Select 'Enable Source Code' for the installer to assist you. Select 'Already Enabled' if you have previously completed this step." | yad \ ---image=/tmp/banner.png \ +--image=$DIR/images/corps-icon.png \ --center \ --text-info \ --wrap \ @@ -2934,14 +2935,14 @@ ${r} ${c} rc=$? if [[ $rc == 1 ]]; then -{ yad --image=/tmp/banner.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c}; exit 1; } +{ yad --image=$DIR/images/corps-icon.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c}; exit 1; } elif [[ $rc == 2 ]]; then { enable_source_repositories; return; } elif [[ $rc == 0 ]]; then yad --center \ ---image=/tmp/banner.png \ +--image=$DIR/images/corps-icon.png \ --title "Source Repositories previously enabled" \ --text "You have confirmed you have enabled source repositories on your system." ${r} ${c} || { yad --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c}; exit 1; } @@ -2958,7 +2959,7 @@ if [[ ${PLAT} = "Raspbian" ]]; then sudo echo 'deb-src http://raspbian.raspberrypi.org/raspbian/ stretch main contrib non-free rpi' | \ sudo tee -a /etc/apt/sources.list && sudo apt-get -y update && \ yad \ ---image=/tmp/banner.png \ +--image=$DIR/images/corps-icon.png \ --center --button="gtk-ok:0" \ --title "Source Code Repositories Enabled" \ --text "Successfully enabled source code repositories" ${r} ${c} @@ -2968,7 +2969,7 @@ yad \ sudo echo 'deb-src http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi' | \ sudo tee -a /etc/apt/sources.list && sudo apt-get -y update && \ yad \ ---image=/tmp/banner.png \ +--image=$DIR/images/corps-icon.png \ --center --button="gtk-ok:0" \ --title "Source Code Repositories Enabled" \ --text "Successfully enabled source code repositories" ${r} ${c} @@ -2984,7 +2985,7 @@ software-sources else -yad --image=/tmp/banner.png --center --button="gtk-ok:0" --title "Not a Supported OS" --text "Please manually enable software sources before continuing." ${r} ${c} +yad --image=$DIR/images/corps-icon.png --center --button="gtk-ok:0" --title "Not a Supported OS" --text "Please manually enable software sources before continuing." ${r} ${c} exit 1 fi @@ -2997,7 +2998,7 @@ elif [[ $rc -eq 1 ]]; then if [[ ${PLAT} = "Raspbian" ]]; then echo "This installer failed to modify your /etc/apt/sources.list/n/nPlease manually \ uncomment the deb-src line by removing the leading # before running this installer" | yad --center \ ---image=/tmp/banner.png \ +--image=$DIR/images/corps-icon.png \ --text-info \ --wrap \ --button="gtk-ok:0" \ @@ -3010,7 +3011,7 @@ echo "This installer failed to open your Sofware Sources menu.\n\nYou can do thi by pressing the Super-Key (Windows Key) and searching for 'Software Sources' in Mint or \ 'Software and Updates,' in Ubuntu.\n\nCheck to ensure Source Code is enabled prior to \ running this installer." | yad --center \ ---image=/tmp/banner.png \ +--image=$DIR/images/corps-icon.png \ --text-info \ --wrap \ --button="gtk-ok:0" \ @@ -3038,7 +3039,7 @@ Otherwise, select 'Skip' to continue without checking for updates. Would you like to perform a repository update at this time? **RECOMMENDED**" | yad --center \ ---image=/tmp/banner.png \ +--image=$DIR/images/corps-icon.png \ --text-info \ --wrap \ --button="gtk-close:1" --button="Skip:2" --button="Update:0" \ @@ -3050,7 +3051,7 @@ rc=$? elif [[ $rc == 2 ]]; then echo "Skipping update check this time" elif [[ $rc == 1 ]]; then - yad --image=/tmp/banner.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c} + yad --image=$DIR/images/corps-icon.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c} exit 1 fi @@ -3085,7 +3086,7 @@ Your current swapfile size is $CURRENTSWAPSIZE. 500 is recommended. A reboot will be required before continuing." | yad \ - --image=/tmp/banner.png \ + --image=$DIR/images/corps-icon.png \ --center \ --text-info \ --wrap \ @@ -3098,7 +3099,7 @@ rc=$? if [[ $rc == 2 ]]; then echo "You selected to not increase your swap file size. If your system freezes up on compiling FLDIGI, please try increasing the swap file." | yad \ ---image=/tmp/banner.png \ +--image=$DIR/images/corps-icon.png \ --center \ --text-info \ --wrap \ @@ -3107,11 +3108,11 @@ rc=$? --title "Welcome to the AmRRON Installer / Updater." \ ${r} ${c} elif [[ $rc == 1 ]]; then - yad --image=/tmp/banner.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c} + yad --image=$DIR/images/corps-icon.png --center --button="gtk-ok:0" --title "Exit Selected" --text "Exiting installer now" ${r} ${c} exit 1 elif [[ $rc == 0 ]]; then sudo sed -i s/CONF_SWAPSIZE=${CURRENTSWAPSIZE}/CONF_SWAPSIZE=500/g $SWAPFILE && \ - yad --image=/tmp/banner.png \ + yad --image=$DIR/images/corps-icon.png \ --center \ --title="Swap Size" \ --text="Your machine will reboot in 10 seconds" \ @@ -3140,7 +3141,7 @@ fi function main_menu() { -yad --image=/tmp/banner.png --center --checklist --print-column=2 --separator="" \ +yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --separator="" \ --title "Select Categories" \ --text "Select the categories of programs you would like to install" \ --list --wrap-width=200 --wrap-cols=3 \ @@ -3190,14 +3191,14 @@ function selection_results() { if [[ -s /tmp/results ]]; then cat /tmp/results | yad --text-info --center \ ---image=/tmp/banner.png \ +--image=$DIR/images/corps-icon.png \ --button="Quit:1" \ --button="Begin:0" \ --title "Confirm Update Selection" \ --text "You have chosen to install / update the following:" ${r} ${c} || exit 1 else yad --center \ - --image=/tmp/banner.png \ + --image=$DIR/images/donate.png \ --button="gtk-ok:0" \ --title "Goodbye" \ --text "You did not make any selections.\n\nThe installer will now exit.\n\nThank you." ${r} ${c} @@ -3375,7 +3376,7 @@ FAIL=$(cat /tmp/failures) if [[ -f /tmp/failures ]]; then -yad --image=/tmp/banner.png --center --button="Save Log:2" --button="gtk-ok:0" \ +yad --image=$DIR/images/corps-icon.png --center --button="Save Log:2" --button="gtk-ok:0" \ --title "Failures" \ --text "The following failures occured during installation:\n\n$FAIL" ${r} ${c} exit=$? if [[ $? == 2 ]]; then @@ -3389,7 +3390,7 @@ if [[ -e $ERRORLOG.log ]]; then fi cp /tmp/failures $ERRORLOG.log yad --center --button="gtk-ok:0" \ ---image=/tmp/banner.png \ +--image=$DIR/images/corps-icon.png \ --title "Failure Log Saved" \ --text "A copy of the failure log was saved at $ERRORLOG.log" ${r} ${c} fi @@ -3407,7 +3408,7 @@ fi function cleanupyad() { echo "${TEXT}" | yad \ --center --text-info \ ---image=/tmp/banner.png --wrap \ +--image=$DIR/images/corps-icon.png --wrap \ --title "${TITLE}" \ ${r} ${c} } @@ -3500,7 +3501,7 @@ echo "This installer searched for, downloaded and installed JS8Call in order to The author's intent however, is for all users of his software join the JS8Call mailing group. This allows for the author to communicate changes the users, gauge the level of interest in his work, and for users to share bugs with the community. Please take a moment to follow this link, register an account if needed. and join the JS8Call group. -https://groups.io/g/js8call" | yad --center --text-info --wrap --image=/tmp/banner.png --show-uri --title "JS8Call Installed" ${r} ${c} +https://groups.io/g/js8call" | yad --center --text-info --wrap --image=$DIR/images/corps-icon.png --show-uri --title "JS8Call Installed" ${r} ${c} ;; @@ -3615,7 +3616,7 @@ Installation skipped." if [[ ${PLAT} = "Raspbian" ]]; then echo --text "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=/tmp/banner.png --center --wrap \ +--image=$DIR/images/corps-icon.png --center --wrap \ --button="No:0" --button="Enable Autostart:2" \ --title "PyBitmessage Autostart Setup." \ ${r} ${c} @@ -3642,7 +3643,7 @@ 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 \ +Would you like me to attempt to do this now?" | yad --image=$DIR/images/corps-icon.png \ --text-info --wrap --center --button="No:0" --button="Enable Autostart:2" \ --title "Conky Autostart Setup." ${r} ${c} rc=$? @@ -3674,21 +3675,21 @@ fi esac done