From a76dfbdd682f38c7ecb96bd39796803ff7dffc93 Mon Sep 17 00:00:00 2001
From: MinyazevR <eeuriset8@gmail.com>
Date: Sat, 28 Dec 2024 18:17:17 +0300
Subject: [PATCH] Rename trik-studio.cmd to trik-studio-safe.cmd

---
 .../packages/qreal-base/ru.qreal.root/meta/installscript.qs    | 3 ++-
 .../packages/qreal-base/ru.qreal.root/meta/prebuild-win32.sh   | 2 +-
 installer/platform/{trik-studio.cmd => trik-studio-safe.cmd}   | 0
 installer/platform/trik-studio.vbs                             | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename installer/platform/{trik-studio.cmd => trik-studio-safe.cmd} (100%)

diff --git a/installer/packages/qreal-base/ru.qreal.root/meta/installscript.qs b/installer/packages/qreal-base/ru.qreal.root/meta/installscript.qs
index 250f6e0ec6..29a1f5ee9e 100644
--- a/installer/packages/qreal-base/ru.qreal.root/meta/installscript.qs
+++ b/installer/packages/qreal-base/ru.qreal.root/meta/installscript.qs
@@ -168,8 +168,9 @@ Component.prototype.createOperations = function()
 		component.addOperation("CreateShortcut"
 				, "@TargetDir@\\" + installer.maintenanceName
 				, "@StartMenuDir@\\Uninstall @ProductName@" + installer.linkExtension);
+		// Rename trik-studio.cmd to trik-studio-safe.cmd to unambiguously interpret the file that users need to run
 		component.addOperation("Execute"
-				, "@TargetDir@\\" + installer.executableName + ".cmd"
+				, "@TargetDir@\\" + installer.executableName + "-safe.cmd"
 				, "--clear-conf");
 	} else if (installer.value("os") == "mac") {
 		component.addOperation("Execute"
diff --git a/installer/packages/qreal-base/ru.qreal.root/meta/prebuild-win32.sh b/installer/packages/qreal-base/ru.qreal.root/meta/prebuild-win32.sh
index e4474b4409..8c84f6f580 100644
--- a/installer/packages/qreal-base/ru.qreal.root/meta/prebuild-win32.sh
+++ b/installer/packages/qreal-base/ru.qreal.root/meta/prebuild-win32.sh
@@ -30,7 +30,7 @@ rsync -a "$BIN_DIR"/qrgui-facade.dll                                     "$PWD"/
 rsync -a "$BIN_DIR/patcher.exe"                                          "$PWD/../data"
 rsync -a "$BIN_DIR/checkapp.exe"                                         "$PWD/../data"
 rsync -a "$BIN_DIR"/trik-studio.exe                                      "$PWD/../data/$PRODUCT.exe"
-rsync -a "$INSTALLER_ROOT/platform/$PRODUCT.cmd"                         "$PWD"/../data/
+rsync -a "$INSTALLER_ROOT/platform/$PRODUCT-safe.cmd"                    "$PWD"/../data/
 rsync -a "$INSTALLER_ROOT/platform/$PRODUCT.vbs"                         "$PWD/../data/"
 rsync -a "$INSTALLER_ROOT/images/trik-studio.ico"                        "$PWD/../data/"
 rsync -a "$BIN_DIR"/plugins/tools/updatesChecker.dll                     "$PWD"/../data/plugins/tools/
diff --git a/installer/platform/trik-studio.cmd b/installer/platform/trik-studio-safe.cmd
similarity index 100%
rename from installer/platform/trik-studio.cmd
rename to installer/platform/trik-studio-safe.cmd
diff --git a/installer/platform/trik-studio.vbs b/installer/platform/trik-studio.vbs
index eff5574523..5491af76ae 100644
--- a/installer/platform/trik-studio.vbs
+++ b/installer/platform/trik-studio.vbs
@@ -3,6 +3,6 @@ For Each arg In WScript.Arguments
   arguments = arguments & " " & arg
 Next
 
-strPath = Left(Wscript.ScriptFullName, InStr(Wscript.ScriptFullName, ".vbs")) & "cmd"
+strPath = Left(Wscript.ScriptFullName, InStr(Wscript.ScriptFullName, ".vbs") - 1) & "-safe.cmd"
 
 CreateObject("WScript.Shell").Run strPath & arguments, 0, true