pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Revert "[win] for bug 70036"' (#15) from fix/revert-70036 into release/v8.2.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/desktop-apps/pulls/15
This commit is contained in:
Maxim Kadushkin
2024-09-19 12:54:57 +00:00
parent 260d0c7a12 56e633c8a3
commit 1ae56c8a3e
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
win-linux/package/windows/common.iss
View File

@ -858,7 +858,6 @@ var
begin
if CurStep = ssPostInstall then begin
DoPostInstall();
CreateLaunchBatch();
GetWindowsVersionEx(version);
if (version.Major > 6) or ((version.Major = 6) and (version.Minor >= 1)) then begin
#ifdef _ONLYOFFICE
@ -1084,11 +1083,11 @@ Name: desktopicon; Description: {cm:CreateDesktopIcon,{#sAppName}}; GroupDescrip
Name: {commondesktop}\{#sAppIconName}; FileName: {app}\{#iconsExe}; WorkingDir: {app}; Tasks: desktopicon; IconFilename: {app}\app.ico; AppUserModelID: {#APP_USER_MODEL_ID};
Name: {group}\{#sAppIconName}; Filename: {app}\{#iconsExe}; WorkingDir: {app}; IconFilename: {app}\app.ico; AppUserModelID: {#APP_USER_MODEL_ID};
Name: {group}\{cm:Uninstall}; IconFilename: {app}\{#iconsExe}; IconIndex: 25; Filename: {uninstallexe}; WorkingDir: {app};
Name: "{group}\{cm:jumpDOCX}"; IconFilename: "{app}\{#iconsExe}"; IconIndex: 14; Filename: "{app}\launch.bat"; Parameters: "--new:word"; Flags: runminimized;
Name: "{group}\{cm:jumpXLSX}"; IconFilename: "{app}\{#iconsExe}"; IconIndex: 15; Filename: "{app}\launch.bat"; Parameters: "--new:cell"; Flags: runminimized;
Name: "{group}\{cm:jumpPPTX}"; IconFilename: "{app}\{#iconsExe}"; IconIndex: 16; Filename: "{app}\launch.bat"; Parameters: "--new:slide"; Flags: runminimized;
Name: "{group}\{cm:jumpDOCX}"; IconFilename: "{app}\{#iconsExe}"; IconIndex: 14; Filename: "{app}\{#iconsExe}"; Parameters: "--new:word";
Name: "{group}\{cm:jumpXLSX}"; IconFilename: "{app}\{#iconsExe}"; IconIndex: 15; Filename: "{app}\{#iconsExe}"; Parameters: "--new:cell";
Name: "{group}\{cm:jumpPPTX}"; IconFilename: "{app}\{#iconsExe}"; IconIndex: 16; Filename: "{app}\{#iconsExe}"; Parameters: "--new:slide";
#ifdef _ONLYOFFICE
Name: "{group}\{cm:jumpDOCXF}"; IconFilename: "{app}\{#iconsExe}"; IconIndex: 17; Filename: "{app}\launch.bat"; Parameters: "--new:form"; Flags: runminimized;
Name: "{group}\{cm:jumpDOCXF}"; IconFilename: "{app}\{#iconsExe}"; IconIndex: 17; Filename: "{app}\{#iconsExe}"; Parameters: "--new:form";
#endif
[Run]
@ -1118,5 +1117,4 @@ Root: HKLM; Subkey: "SOFTWARE\Classes\{#sAppProtocol}\Shell\Open\Command"; Value
[UninstallDelete]
Type: filesandordirs; Name: {commonappdata}\{#APP_PATH}\*; AfterInstall: RefreshEnvironment;
Type: filesandordirs; Name: "{app}\..\{#UPD_PATH}";
Type: files; Name: "{app}\launch.bat";
Type: files; Name: "{app}\svcrestart.bat";

11
win-linux/package/windows/utils.iss
View File

@ -105,17 +105,6 @@ begin
Result := msiproductupgrade(upgradecode, '14.27.29114.0');
end;
procedure CreateLaunchBatch();
var
fileName: String;
lines: TArrayOfString;
begin
SetArrayLength(lines, 1);
fileName := ExpandConstant('{app}\launch.bat');
lines[0] := ExpandConstant('start "" "{app}\{#iconsExe}" %*');
SaveStringsToFile(fileName, lines, False);
end;
function ReadBinFile(fileName: String; list: TStringList): Boolean;
var
fs: TFileStream;