opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2026-03-13 09:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: add sshpass.exe v1.0.6 for Windows, and refactor Windows installer script

Browse Source 
https://github.com/xhcoding/sshpass-win32
This commit is contained in:
Ansgar Becker
2026-02-25 14:10:14 +01:00
parent b7c3d07ebb
commit d79d462d17
5 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
create-windows-installer.iss
View File

@@ -96,31 +96,12 @@ Source: "license.txt"; DestDir: "{app}"; Flags: ignoreversion
Source: "LICENSE"; DestDir: "{app}"; Flags: ignoreversion
Source: "extra\dll\plugins\*.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion
Source: "extra\Snippets\*.sql"; DestDir: "{#SnippetsDir}"; Tasks: install_snippets
Source: "extra\dll\plink-64.exe"; DestDir: "{app}"; DestName: "plink.exe"; Flags: ignoreversion
Source: "extra\dll\plink-0.81-64.exe"; DestDir: "{app}"; DestName: "plink-0.81.exe"; Flags: ignoreversion
; MySQL + MariaDB:
Source: "extra\dll\libmariadb.dll"; DestDir: "{app}"; DestName: "libmariadb.dll"; Flags: ignoreversion
Source: "extra\dll\libmysql.dll"; DestDir: "{app}"; DestName: "libmysql.dll"; Flags: ignoreversion
Source: "extra\dll\libmysql-6.1.dll"; DestDir: "{app}"; DestName: "libmysql-6.1.dll"; Flags: ignoreversion
Source: "extra\dll\libmysql-8.4.0.dll"; DestDir: "{app}"; DestName: "libmysql-8.4.0.dll"; Flags: ignoreversion
Source: "extra\dll\libmysql-9.4.0.dll"; DestDir: "{app}"; DestName: "libmysql-9.4.0.dll"; Flags: ignoreversion
; PostgreSQL:
Source: "extra\dll\libpq-15.dll"; DestDir: "{app}"; DestName: "libpq-15.dll"; Flags: ignoreversion
Source: "extra\dll\libpq-17.dll"; DestDir: "{app}"; DestName: "libpq-17.dll"; Flags: ignoreversion
Source: "extra\dll\libintl-9.dll"; DestDir: "{app}"; DestName: "libintl-9.dll"; Flags: ignoreversion
Source: "extra\dll\libssl-3-x64.dll"; DestDir: "{app}"; DestName: "libssl-3-x64.dll"; Flags: ignoreversion
Source: "extra\dll\libcrypto-3-x64.dll"; DestDir: "{app}"; DestName: "libcrypto-3-x64.dll"; Flags: ignoreversion
Source: "extra\dll\LICENSE-openssl"; DestDir: "{app}"; Flags: ignoreversion
Source: "extra\dll\libiconv-2.dll"; DestDir: "{app}"; DestName: "libiconv-2.dll"; Flags: ignoreversion
Source: "extra\dll\libwinpthread-1.dll"; DestDir: "{app}"; DestName: "libwinpthread-1.dll"; Flags: ignoreversion
; SQLite:
Source: "extra\dll\sqlite3.dll"; DestDir: "{app}"; DestName: "sqlite3.dll"; Flags: ignoreversion
Source: "extra\dll\sqlite3mc.dll"; DestDir: "{app}"; DestName: "sqlite3mc.dll"; Flags: ignoreversion
; Interbase/Firebird:
Source: "extra\dll\ibclient64-14.1.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "extra\dll\fbclient-4.0.dll"; DestDir: "{app}"; DestName: "fbclient-4.0.dll"; Flags: ignoreversion
; Just everything from the dll folder, including plink and some others
Source: "extra\dll\*.*"; DestDir: "{app}"; Flags: ignoreversion
; SQL function definitions
Source: "extra\ini\functions-*.ini"; DestDir: "{app}"; Flags: ignoreversion
; Translation files
Source: "extra\locale\*.mo"; DestDir: "{app}\locale"; Flags: ignoreversion
[Icons]

0
extra/dll/plink-0.81-64.exe → extra/dll/plink-0.81.exe
View File

0
extra/dll/plink-64.exe → extra/dll/plink.exe
View File

BIN
extra/dll/sshpass.exe Normal file
View File

Binary file not shown.

20
source/dbconnection.pas
View File

@@ -1040,8 +1040,14 @@ begin
{$IFDEF DARWIN}
// See https://www.heidisql.com/forum.php?t=44716
Result := '/opt/homebrew/bin/sshpass';
{$ELSE}
Result := '';
{$ENDIF}
{$IFDEF WINDOWS}
// https://github.com/xhcoding/sshpass-win32
Result := GetAppDir + 'sshpass.exe';
{$ENDIF}
{$IFDEF LINUX}
// Should be found in a known path
Result := 'sshpass';
{$ENDIF}
end;
@@ -1055,7 +1061,7 @@ var
CheckIntervalMs: Integer;
TimeStartedMs, WaitedMs, TimeOutMs: Int64;
EnvSshpass: String;
EnvList: TStringList;
EnvList, ProcOutput: TStringList;
begin
// Check if local port is open
PortChecks := 0;
@@ -1115,7 +1121,13 @@ begin
FProcess.Execute;
except
on E:EProcess do begin
ErrorText := CRLF + CRLF + SshCmdDisplay + CRLF + CRLF + 'System message: ' + SysErrorMessage(GetLastOSError);
ProcOutput := TStringList.Create;
ProcOutput.LoadFromStream(FProcess.Output);
ErrorText := sLineBreak +
SshCmdDisplay + sLineBreak +
ProcOutput.Text + sLineBreak +
'System message: ' + SysErrorMessage(GetLastOSError);
ProcOutput.Free;
ErrorText := f_('Could not execute SSH command: %s', [ErrorText]);
raise EDbError.Create(ErrorText);
end;