Rosetta/desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Актуализация ветки Dev #2

Merged
Royce59 merged 43 commits from main into dev 2026-02-18 17:08:04 +00:00
Conversation 0 Commits 43 Files Changed 9 +3 -2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 597e2e0532 - Show all commits

5
.gitea/workflows/sshupload.ps1
View File

@@ -47,7 +47,8 @@ if (-not $ServerAddress) {
if (-not $Username) { if (-not $Username) {
$Username = if ($env:SFTP_USERNAME) { $env:SFTP_USERNAME } else { $CONFIG_Username } $Username = if ($env:SFTP_USERNAME) { $env:SFTP_USERNAME } else { $CONFIG_Username }
} }
if (-not $PasswordParam) { # Если пароль передан через CLI (-PasswordParam), используем его даже если пустая строка
if (-not $PSBoundParameters.ContainsKey('PasswordParam')) {
$PasswordParam = if ($env:SFTP_PASSWORD) { $env:SFTP_PASSWORD } else { $CONFIG_Password } $PasswordParam = if ($env:SFTP_PASSWORD) { $env:SFTP_PASSWORD } else { $CONFIG_Password }
} }
if (-not $LocalFilePath) { if (-not $LocalFilePath) {
@@ -67,7 +68,7 @@ if (-not $WinSCPPath) {
$requiredParams = @( $requiredParams = @(
@{Name = "ServerAddress"; Value = $ServerAddress}, @{Name = "ServerAddress"; Value = $ServerAddress},
@{Name = "Username"; Value = $Username}, @{Name = "Username"; Value = $Username},
@{Name = "Password"; Value = $PasswordParam}, @{Name = "PasswordParam"; Value = $PasswordParam},
@{Name = "LocalFilePath"; Value = $LocalFilePath}, @{Name = "LocalFilePath"; Value = $LocalFilePath},
@{Name = "RemoteFolderPath"; Value = $RemoteFolderPath} @{Name = "RemoteFolderPath"; Value = $RemoteFolderPath}
) )