diff --git a/desktop/icons/varafm.png b/desktop/icons/varafm.png deleted file mode 100644 index 80998f0..0000000 Binary files a/desktop/icons/varafm.png and /dev/null differ diff --git a/desktop/icons/varahf.png b/desktop/icons/varahf.png deleted file mode 100644 index 4676e19..0000000 Binary files a/desktop/icons/varahf.png and /dev/null differ diff --git a/desktop/icons/varaterminal.png b/desktop/icons/varaterminal.png deleted file mode 100644 index c72e8d3..0000000 Binary files a/desktop/icons/varaterminal.png and /dev/null differ diff --git a/desktop/varafm.desktop b/desktop/varafm.desktop old mode 100755 new mode 100644 index 36416d6..6156dec --- a/desktop/varafm.desktop +++ b/desktop/varafm.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Name=VARA HF +Name=VARA FM Comment=Vara Modem for HF Exec=wine $HOME/.wine/drive_c/'VARA FM'/VARAFM.exe Icon=$HOME/.local/share/HamPack/desktop/icons/varafm.png diff --git a/desktop/varahf.desktop b/desktop/varahf.desktop deleted file mode 100755 index 1f8f788..0000000 --- a/desktop/varahf.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=VARA HF -Comment=Vara Modem for HF -Exec=wine $HOME/.wine/drive_c/VARA/VARA.exe -Icon=$HOME/.local/share/HamPack/desktop/icons/varahf.png -Type=Application -Categories=HamRadio;Utility; -Terminal=false -StartupNotify=true -Path=$HOME/.wine/drive_c/VARA/ diff --git a/desktop/varaterminal.desktop b/desktop/varaterminal.desktop deleted file mode 100755 index 8c7d319..0000000 --- a/desktop/varaterminal.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=VARA HF -Comment=Vara Modem for HF -Exec=wine $HOME/.wine/drive_c/VARA/'VARA Terminal.exe' -Icon=$HOME/.local/share/HamPack/desktop/icons/varaterminal.png -Type=Application -Categories=HamRadio;Utility; -Terminal=false -StartupNotify=true -Path=$HOME/.wine/drive_c/VARA/ diff --git a/install-windows-apps.sh b/install-windows-apps.sh index f61da67..f7e7eb8 100755 --- a/install-windows-apps.sh +++ b/install-windows-apps.sh @@ -71,8 +71,15 @@ download_vara() { # Install a VARA product using Wine install_vara() { local pattern="$1" + local wine_dir="$2" local extract_dir="$DOWNLOAD_DIR/$(echo "$pattern" | sed 's| |_|g')" + # Check if already installed + if [ -d "$wine_dir" ]; then + echo " $pattern is already installed, skipping." + return 0 + fi + if [ ! -d "$extract_dir" ]; then echo "Error: directory $extract_dir not found, skipping." return 1 @@ -134,31 +141,13 @@ echo "Wine dependencies installed successfully." echo "" echo "Starting VARA installations..." -install_vara "VARA HF" -install_vara "VARA FM" -install_vara "VARA Terminal" +install_vara "VARA HF" "$HOME/.wine/drive_c/VARA" +install_vara "VARA FM" "$HOME/.wine/drive_c/VARA FM" +install_vara "VARA Terminal" "$HOME/.wine/drive_c/VARA" -# Install VARA desktop files echo "" -echo "Installing VARA desktop files..." - -DESKTOP_SRC="$HOME/.local/share/HamPack/desktop" -DESKTOP_DST="$HOME/.local/share/applications" - -mkdir -p "$DESKTOP_DST" - -for desktop in varafm.desktop varahf.desktop varaterminal.desktop; do - if [ ! -f "$DESKTOP_SRC/$desktop" ]; then - echo " Warning: $desktop not found in $DESKTOP_SRC, skipping." - continue - fi - mv "$DESKTOP_SRC/$desktop" "$DESKTOP_DST/$desktop" - chmod +x "$DESKTOP_DST/$desktop" - echo " Installed $desktop" -done - echo "Updating desktop database..." -update-desktop-database "$DESKTOP_DST" +update-desktop-database "$HOME/.local/share/applications/" echo "" echo "All VARA installations complete." \ No newline at end of file