From 4f284bc79cb13bb5ae760d099310ddd8dbf0e596 Mon Sep 17 00:00:00 2001
From: elecpower <neilh713@tpg.com.au>
Date: Thu, 18 Nov 2021 07:15:07 +1100
Subject: [PATCH] Change more installer refs to edgetx and etx file extension

---
 companion/src/CMakeLists.txt               |  4 ++--
 companion/targets/windows/companion.nsi.in | 17 +++++++----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index 7f6ef9263..d160ff674 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -529,7 +529,7 @@ IF(APPLE)
   # technically a hack (that is already is in the Bundle library ...)
   install(CODE "
    include(BundleUtilities)
-   file(GLOB bundle_simulator_libs \"\${CMAKE_INSTALL_PREFIX}/${companion_res_dir}/libopentx-*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
+   file(GLOB bundle_simulator_libs \"\${CMAKE_INSTALL_PREFIX}/${companion_res_dir}/libedgetx-*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
    set(BU_CHMOD_BUNDLE_ITEMS on)
    fixup_bundle(\"${APPS}\"   \"\${bundle_simulator_libs};${bundle_qt_libs};${bundle_tools_path}\"   \"${QT_LIB_DIR}\")
    file(RENAME \"\${CMAKE_INSTALL_PREFIX}/${COMPANION_NAME}.app\" \"\${CMAKE_INSTALL_PREFIX}/${COMPANION_OSX_APP_BUNDLE_NAME}.app\")
@@ -543,7 +543,7 @@ if(APPLE)
   set(CPACK_DMG_BACKGROUND_IMAGE ${COMPANION_SRC_DIRECTORY}/images/splash_dmg.png)
   set(CPACK_DMG_VOLUME_NAME "EdgeTX Companion")
   set(CPACK_DMG_DS_STORE ${PROJECT_SOURCE_DIR}/companion/targets/mac/DS_Store)
-  set(CPACK_PACKAGE_FILE_NAME "opentx-${CPACK_PACKAGE_NAME_LOWERCASE}-${VERSION}")
+  set(CPACK_PACKAGE_FILE_NAME "edgetx-${CPACK_PACKAGE_NAME_LOWERCASE}-${VERSION}")
 endif(APPLE)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
diff --git a/companion/targets/windows/companion.nsi.in b/companion/targets/windows/companion.nsi.in
index 4db7bc587..81c04314e 100644
--- a/companion/targets/windows/companion.nsi.in
+++ b/companion/targets/windows/companion.nsi.in
@@ -104,7 +104,7 @@
 
 Section "EdgeTX Companion @VERSION_FAMILY@" SecDummy
 
-  Delete "$INSTDIR\opentx-*-simulator.dll"
+  Delete "$INSTDIR\edgetx-*-simulator.dll"
   RMDir /r "$INSTDIR\lang"
   RMDir /r "$INSTDIR\phonon_backend"
 
@@ -116,8 +116,8 @@ Section "EdgeTX Companion @VERSION_FAMILY@" SecDummy
   ;Store installation folder
   WriteRegStr HKCU "Software\EdgeTX\Companion @VERSION_FAMILY@" "" $INSTDIR
 
-  ;Associate with extentions .otx
-  ${registerExtension} "$INSTDIR\companion.exe" ".otx" "EdgeTX Settings File"
+  ;Associate with extentions .etx
+  ${registerExtension} "$INSTDIR\companion.exe" ".etx" "EdgeTX Settings File"
 
   ;Create uninstaller
   WriteUninstaller "$INSTDIR\Uninstall.exe"
@@ -177,7 +177,7 @@ Section "un.EdgeTX Companion @VERSION_FAMILY@"
   Delete "$INSTDIR\license.txt"
   Delete "$INSTDIR\companion.exe"
   Delete "$INSTDIR\simulator.exe"
-  Delete "$INSTDIR\*opentx-*-simulator.dll"
+  Delete "$INSTDIR\*edgetx-*-simulator.dll"
   Delete "$INSTDIR\SDL.dll"
   ; MSVC-specific libs
   Delete "$INSTDIR\msvcp140.dll"
@@ -218,10 +218,7 @@ Section "un.EdgeTX Companion @VERSION_FAMILY@"
 
   RMDir "$INSTDIR"
 
-  ${unregisterExtension} ".bin" "BIN File"
-  ${unregisterExtension} ".hex" "HEX File"
-  ${unregisterExtension} ".eepm" "EEPE File"
-  ${unregisterExtension} ".otx" "EdgeTX Settings File"
+  ${unregisterExtension} ".etx" "EdgeTX Settings File"
 
   !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
 
@@ -275,7 +272,7 @@ Function StartMenuLocationCreator
   ${NSD_CreateLabel} 0u 0u 100% 12u $(SML_MainLabel)
   Pop $R0
 
-  ${NSD_CreateRadioButton} 8u 20u 100% 12u $(SML_RadioCurrent) 
+  ${NSD_CreateRadioButton} 8u 20u 100% 12u $(SML_RadioCurrent)
   Pop $StartMenuLocationRadioCurrent
   ${NSD_AddStyle} $StartMenuLocationRadioCurrent ${WS_GROUP}
 
@@ -284,7 +281,7 @@ Function StartMenuLocationCreator
 
   ${If} $StartMenuLocationValue == "all_users"
     ${NSD_SetState} $StartMenuLocationRadioAll ${BST_CHECKED}
-  ${Else}  
+  ${Else}
     ${NSD_SetState} $StartMenuLocationRadioCurrent ${BST_CHECKED}
   ${EndIf}