From fa5af7b3ac1d0e88b300c936e58c1b35bf0895dc Mon Sep 17 00:00:00 2001 From: tangobravo14 Date: Sat, 30 Dec 2023 15:02:08 -0600 Subject: [PATCH] AmRRON V5.00 Forms --- AmRRON-Setup-Script.sh | 87 +++++++++++++++++++++++++++--------------- 1 file changed, 56 insertions(+), 31 deletions(-) diff --git a/AmRRON-Setup-Script.sh b/AmRRON-Setup-Script.sh index de8c381..a50c1bc 100755 --- a/AmRRON-Setup-Script.sh +++ b/AmRRON-Setup-Script.sh @@ -1633,6 +1633,54 @@ fi } +#function amrronforms_install() { +# FORMSDIR=$HOME/.nbems/CUSTOM +# if [ ! -d $HOME/.nbems/CUSTOM ]; then +# mkdir -p $HOME/.nbems/CUSTOM/ || +# { ERRCODE="Failed to create directory at $HOME/.nbems/CUSTOM/"; errors; return; } +# fi +# +# if ls $FORMSDIR/*REPV3.html 1>/dev/null 2>&1; then +# echo "V3 of Forms are already installed" +# else +# cd $FORMSDIR && wget -N https://amrron.com/wp-content/uploads/2014/\ +#11/AmRRON-Custom-Forms-V3.zip || +# { ERRCODE="Failed to download AmRRON Custom Forms V3"; errors; return; } +# fi +# +# if [[ -f $FORMSDIR/AMRRON_BLANKV3.html ]]; then +# echo "AmRRON Blank V3 is already installed." + # else +# cd $FORMSDIR && wget -N https://amrron.com/wp-content/uploads/\ +#2013/11/AMRRON_BLANKV3.zip || +# { ERRCODE="Failed to download AmRRON Blank V3"; errors; return; } +# fi +# +# if [[ -f $FORMSDIR/AmRRON_StatRepv2.html ]]; then +# echo "AmRRON STATREP V2 is already installed" +# else +# cd $FORMSDIR && wget -N https://amrron.com/wp-content/uploads/\ +#2018/03/AmRRON_StatRepv2.zip || +# { ERRCODE="Failed to download AmRRON StatRep V2"; errors; return; } +# fi +# +# if [[ -f $FORMSDIR/amrron_statrep_V4.0.html ]]; then +# echo "AmRRON STATREP V4 is already installed" +# else +# cd $FORMSDIR && wget -N https://amrron.com/wp-content/uploads/2023/02/amrron_statrep_V4.0.html.zip || +# { ERRCODE="Failed to download AmRRON StatRep V4"; errors; return; } +# fi +# +# if ls $FORMSDIR/*zip 1>/dev/null 2>&1; then +# echo "Extracting forms..." +# unzip -o $FORMSDIR/'*'.zip && rm $FORMSDIR/*.zip || +# { ERRCODE="Failed to move forms to $HOME/.nbems/CUSTOM/"; errors; return; } +# else +# echo "All custom forms are already installed." +# fi +# } + + function amrronforms_install() { FORMSDIR=$HOME/.nbems/CUSTOM if [ ! -d $HOME/.nbems/CUSTOM ]; then @@ -1640,46 +1688,23 @@ function amrronforms_install() { { ERRCODE="Failed to create directory at $HOME/.nbems/CUSTOM/"; errors; return; } fi - if ls $FORMSDIR/*REPV3.html 1>/dev/null 2>&1; then - echo "V3 of Forms are already installed" + if ls $FORMSDIR/*V5.00.html 1>/dev/null 2>&1; then + echo "V5 of Forms are already installed" else - cd $FORMSDIR && wget -N https://amrron.com/wp-content/uploads/2014/\ -11/AmRRON-Custom-Forms-V3.zip || - { ERRCODE="Failed to download AmRRON Custom Forms V3"; errors; return; } + cd $FORMSDIR && wget -N https://amrron.com/wp-content/uploads/2023/02/V5.0-Forms.zip || + { ERRCODE="Failed to download AmRRON Custom Forms V5.00"; errors; return; } fi - if [[ -f $FORMSDIR/AMRRON_BLANKV3.html ]]; then - echo "AmRRON Blank V3 is already installed." - else - cd $FORMSDIR && wget -N https://amrron.com/wp-content/uploads/\ -2013/11/AMRRON_BLANKV3.zip || - { ERRCODE="Failed to download AmRRON Blank V3"; errors; return; } - fi - - if [[ -f $FORMSDIR/AmRRON_StatRepv2.html ]]; then - echo "AmRRON STATREP V2 is already installed" - else - cd $FORMSDIR && wget -N https://amrron.com/wp-content/uploads/\ -2018/03/AmRRON_StatRepv2.zip || - { ERRCODE="Failed to download AmRRON StatRep V2"; errors; return; } - fi - - if [[ -f $FORMSDIR/amrron_statrep_V4.0.html ]]; then - echo "AmRRON STATREP V4 is already installed" - else - cd $FORMSDIR && wget -N https://amrron.com/wp-content/uploads/2023/02/amrron_statrep_V4.0.html.zip || - { ERRCODE="Failed to download AmRRON StatRep V4"; errors; return; } - fi - - if ls $FORMSDIR/*zip 1>/dev/null 2>&1; then + if ls $FORMSDIR/*zip 1>/dev/null 2>&1; then echo "Extracting forms..." - unzip -o $FORMSDIR/'*'.zip && rm $FORMSDIR/*.zip || + unzip -j $FORMSDIR/'*'.zip -d $FORMSDIR/ && rm $FORMSDIR/*.zip || { ERRCODE="Failed to move forms to $HOME/.nbems/CUSTOM/"; errors; return; } else echo "All custom forms are already installed." fi } + function comstat_install() { if [[ $OSCN =~ una|vanessa|vera ]]; then @@ -3279,7 +3304,7 @@ yad --image=$DIR/images/corps-icon.png --center --checklist --print-column=2 --s false "COMSTATX" "JS8Call mapping (Mint only)" "Unknown" "Unknown" \ false "PULSE" "Pulseaudio suite. Includes pulseaudio, pavucontrol, and pulseaudio-utils." "Unable to determine" "Unable to determine" \ false "UBLOX" "Installs programs and settings to use the UBLOX GPS for system time." "Unable to determine" "Unable to determine" \ - false "FORMS" "AmRRON Form templates will be downloaded." "Unknown" "Version 3" \ + false "FORMS" "AmRRON Form templates will be downloaded." "Unknown" "Version 5.00" \ ${r} ${c} >>/tmp/results rc=$?