MP1-5185: NSIS: Update x64 Uninstal shortcut names

MediaPortal · Dec 11, 2023 · 56831ef · 56831ef
1 parent aea9994
commit 56831ef
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/TvEngine3/TVLibrary/Setup/setup.nsi b/TvEngine3/TVLibrary/Setup/setup.nsi
@@ -986,7 +986,11 @@ Section -Post
     ;!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
     ; We need to create the StartMenu Dir. Otherwise the CreateShortCut fails
     CreateDirectory "${STARTMENU_GROUP}"
-    CreateShortCut "${STARTMENU_GROUP}\uninstall TV-Server.lnk" "$INSTDIR\uninstall-tve3.exe"
+    !if "${Architecture}" == "x64"
+        CreateShortCut "${STARTMENU_GROUP}\Uninstall TV-Server (x64).lnk" "$INSTDIR\uninstall-tve3.exe" "" "$INSTDIR\uninstall-tve3.exe"  0 "" "" "Uninstall TV-Server (x64)"
+    !else
+        CreateShortCut "${STARTMENU_GROUP}\Uninstall TV-Server.lnk" "$INSTDIR\uninstall-tve3.exe" "" "$INSTDIR\uninstall-tve3.exe"  0 "" "" "Uninstall TV-Server"
+    !endif
     WriteINIStr "${STARTMENU_GROUP}\Help.url"      "InternetShortcut" "URL" "http://wiki.team-mediaportal.com/"
     WriteINIStr "${STARTMENU_GROUP}\web site.url"  "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
     ;!insertmacro MUI_STARTMENU_WRITE_END
@@ -1043,7 +1047,11 @@ Section Uninstall
 
   ; remove Start Menu shortcuts
   ; $StartMenuGroup (default): "Team MediaPortal\TV Server"
-  Delete "${STARTMENU_GROUP}\uninstall TV-Server.lnk"
+  !if "${Architecture}" == "x64"
+    Delete "${STARTMENU_GROUP}\Uninstall TV-Server (x64).lnk"
+  !else
+    Delete "${STARTMENU_GROUP}\Uninstall TV-Server.lnk"
+  !endif
   Delete "${STARTMENU_GROUP}\Help.url"
   Delete "${STARTMENU_GROUP}\web site.url"
   RMDir "${STARTMENU_GROUP}"

diff --git a/mediaportal/Setup/setup.nsi b/mediaportal/Setup/setup.nsi
@@ -1228,12 +1228,12 @@ Section -Post
       CreateShortCut "${STARTMENU_GROUP}\MediaPortal Configuration.lnk"              "$MPdir.Base\Configuration.exe" ""      "$MPdir.Base\Configuration.exe" 0 "" "" "MediaPortal Configuration (x64)"
       CreateShortCut "${STARTMENU_GROUP}\MediaPortal WatchDog.lnk"                   "$MPdir.Base\WatchDog.exe"      ""      "$MPdir.Base\WatchDog.exe"      0 "" "" "MediaPortal WatchDog (x64)"
       CreateShortCut "${STARTMENU_GROUP}\MediaPortal x86Proxy.lnk"                   "$MPdir.Base\MPx86Proxy.exe"    "-h"    "$MPdir.Base\MPx86Proxy.exe"    0 "" "" "MediaPortal x86 Proxy"
-      CreateShortCut "${STARTMENU_GROUP}\uninstall MediaPortal.lnk"                  "$MPdir.Base\uninstall-mp.exe"
+      CreateShortCut "${STARTMENU_GROUP}\Uninstall MediaPortal (x64).lnk"            "$MPdir.Base\uninstall-mp.exe"  ""      "$MPdir.Base\uninstall-mp.exe"  0 "" "" "Uninstall MediaPortal (x64)"
       !else
       CreateShortCut "${STARTMENU_GROUP}\MediaPortal.lnk"                            "$MPdir.Base\MediaPortal.exe"   ""      "$MPdir.Base\MediaPortal.exe"   0 "" "" "MediaPortal"
       CreateShortCut "${STARTMENU_GROUP}\MediaPortal Configuration.lnk"              "$MPdir.Base\Configuration.exe" ""      "$MPdir.Base\Configuration.exe" 0 "" "" "MediaPortal Configuration"
       CreateShortCut "${STARTMENU_GROUP}\MediaPortal WatchDog.lnk"                   "$MPdir.Base\WatchDog.exe"      ""      "$MPdir.Base\WatchDog.exe"      0 "" "" "MediaPortal WatchDog"
-      CreateShortCut "${STARTMENU_GROUP}\uninstall MediaPortal.lnk"                  "$MPdir.Base\uninstall-mp.exe"
+      CreateShortCut "${STARTMENU_GROUP}\Uninstall MediaPortal.lnk"                  "$MPdir.Base\uninstall-mp.exe"  ""      "$MPdir.Base\uninstall-mp.exe"  0 "" "" "Uninstall MediaPortal"
       !endif
       CreateShortCut "${STARTMENU_GROUP}\User Files.lnk"                             "$MPdir.Config"                 ""      "$MPdir.Config"                 0 "" "" "Browse you config files, databases, thumbs, logs, ..."
 
@@ -1296,12 +1296,14 @@ Section Uninstall
   Delete "${STARTMENU_GROUP}\MediaPortal WatchDog.lnk"
   !if "${Architecture}" == "x64"
     Delete "${STARTMENU_GROUP}\MediaPortal x86Proxy.lnk"
+    Delete "${STARTMENU_GROUP}\Uninstall MediaPortal (x64).lnk"
   !else
+    Delete "${STARTMENU_GROUP}\Uninstall MediaPortal.lnk"
   !endif
   Delete "${STARTMENU_GROUP}\MediaPortal Log-Files.lnk"
   Delete "${STARTMENU_GROUP}\MediaPortal TestTool.lnk"
   Delete "${STARTMENU_GROUP}\MediaPortal Logs Collector.lnk"
-  Delete "${STARTMENU_GROUP}\uninstall MediaPortal.lnk"
+
   Delete "${STARTMENU_GROUP}\User Files.lnk"
 
   Delete "${STARTMENU_GROUP}\Quick Setup Guide.url"