From 3102ccd09b16aea435d4894a2a3ed3b90c403762 Mon Sep 17 00:00:00 2001 From: thetechprepper Date: Mon, 16 Mar 2026 14:38:46 -0700 Subject: [PATCH] Revert "Merge pull request #88 from corvus-ch/varac" This reverts commit 9de3852af8795571ad15ab6efca682921cb92d96, reversing changes made to 2556e68435cc848f55754822f31dd41f4fbbb994. --- .../skel/add-ons/wine/03-install-vara-fm.sh | 3 +-- .../etc/skel/add-ons/wine/04-install-varac.sh | 27 ------------------- .../{05-run-regedit.sh => 04-run-regedit.sh} | 0 ...e-install.sh => 05-backup-wine-install.sh} | 0 overlay/etc/skel/add-ons/wine/README.md | 24 +++++++---------- 5 files changed, 11 insertions(+), 43 deletions(-) delete mode 100755 overlay/etc/skel/add-ons/wine/04-install-varac.sh rename overlay/etc/skel/add-ons/wine/{05-run-regedit.sh => 04-run-regedit.sh} (100%) rename overlay/etc/skel/add-ons/wine/{06-backup-wine-install.sh => 05-backup-wine-install.sh} (100%) diff --git a/overlay/etc/skel/add-ons/wine/03-install-vara-fm.sh b/overlay/etc/skel/add-ons/wine/03-install-vara-fm.sh index a7ff171..f94a7e3 100755 --- a/overlay/etc/skel/add-ons/wine/03-install-vara-fm.sh +++ b/overlay/etc/skel/add-ons/wine/03-install-vara-fm.sh @@ -30,5 +30,4 @@ if [ ! -e "${VARA_HOME}/nt4pdhdll.exe" ]; then cd ${CWD} fi -echo -e "${YELLOW}OPTIONAL: run ${WHITE}./04-install-varac.sh${YELLOW} to install VarAC.${NC}" -echo -e "${YELLOW}Or run ${WHITE}./05-run-regedit.sh${YELLOW} to run registry editor.${NC}" +echo -e "${YELLOW}Run ${WHITE}./04-run-regedit.sh${YELLOW} to run registry editor.${NC}" diff --git a/overlay/etc/skel/add-ons/wine/04-install-varac.sh b/overlay/etc/skel/add-ons/wine/04-install-varac.sh deleted file mode 100755 index 1abac42..0000000 --- a/overlay/etc/skel/add-ons/wine/04-install-varac.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# -# Purpose : Install VarAC - -source /opt/emcomm-tools/bin/et-common - -winetricks \ - --unattended \ - vcrun2015 \ - dotnet48 \ - tahoma - -installer=$(find ${HOME}/Downloads -name VarAC_Installer_*.exe | sort -r | head -n1) - -if [ -z "${installer}" ]; then - echo -e "${YELLOW}VarAC can not be downloaded automatically" - echo -e "${WHITE}Visit https://www.varac-hamradio.com/download#:~:text=Download%20VarAC%20Windows%20Installer" - echo -e "Fill out the form to download the VarAC Windows Installer executable (.exe) and place it into ~/Downloads" - echo -e "Rerun ./04-install-varac.sh${NC}" - exit 1 -fi - -if [ -f "${installer}" ]; then - wine "${installer}" -fi - -echo -e "${YELLOW}Run ${WHITE}./05-run-regedit.sh${YELLOW} to run registry editor.${NC}" diff --git a/overlay/etc/skel/add-ons/wine/05-run-regedit.sh b/overlay/etc/skel/add-ons/wine/04-run-regedit.sh similarity index 100% rename from overlay/etc/skel/add-ons/wine/05-run-regedit.sh rename to overlay/etc/skel/add-ons/wine/04-run-regedit.sh diff --git a/overlay/etc/skel/add-ons/wine/06-backup-wine-install.sh b/overlay/etc/skel/add-ons/wine/05-backup-wine-install.sh similarity index 100% rename from overlay/etc/skel/add-ons/wine/06-backup-wine-install.sh rename to overlay/etc/skel/add-ons/wine/05-backup-wine-install.sh diff --git a/overlay/etc/skel/add-ons/wine/README.md b/overlay/etc/skel/add-ons/wine/README.md index 4c2e185..7c20086 100644 --- a/overlay/etc/skel/add-ons/wine/README.md +++ b/overlay/etc/skel/add-ons/wine/README.md @@ -17,21 +17,17 @@ in this directory as your normal user (do not use 'sudo'). ./03-install-vara-fm.sh -4. OPTIONAL: Install VarAC. - - ./04-install-varac.sh - -5. Run the registry editor. Follow the instructions in the terminal. In +4. Run the registry editor. Follow the instructions in the terminal. In this step we will need to map COM port 10 (COM10) to the EmComm Tools CAT control device (/dev/et-cat). - ./05-run-regedit.sh + ./04-run-regedit.sh -6. If you want to include your WINE installation in a future EmComm Tools +5. If you want to include your WINE installation in a future EmComm Tools Community image build, run the following to make a backup of your WINE installation now. - ./06-backup-wine-install.sh + ./05-backup-wine-install.sh It is important that you do not run any of the VARA programs until after the backup is run in step 5. @@ -48,12 +44,12 @@ perform the following in Cubic after the main install script is finished. 3. Unpack the backup file. This will create `/etc/skel/.wine32`. - ``` - tar -xzf etc-wine-backup-* - ``` +``` +tar -xzf etc-wine-backup-* +``` 4. Delete the backup file on the Cubic session to save on space. - ``` - rm etc-wine-backup-* - ``` +``` +rm etc-wine-backup-* +```