Corrections

Former-commit-id: 75056ee05ae10b8be21a5a10f42e8e637309fe39 [formerly d9110d17f3f667ba14fbcc7a65003730f271ba24] [formerly 9773c7c80ccba7eef8eef0f5c17ff1eafc790150] [formerly fa103a6fa0179dc8738dea99e7b7ec0c1f398cd1 [formerly 516c411afc900b883c8d56e5212d4527ca764122 [formerly df313d5cebfb09349b4037523c7fd396295c0133]]]
Former-commit-id: 6cfe1a52aa07f8fa64391d2e18ef54267baf6475 [formerly 2f9b1848701915ee867e502af9c4bef279284b25 [formerly 2900a02fe81676aa6ee3725d4a7b45a79fc633aa]]
Former-commit-id: 438fdc3cd73bd75fd3e0eaf2bda7c95f5f1a8b02 [formerly 0cb4d147b74acc3d17b1f19dbf34f54655621ed6]
Former-commit-id: ead8e2aba369aa6f701dc8264bd19a201cc0d982
This commit is contained in:
Jaifroid 2022-03-14 18:21:56 +00:00
parent 73da385c8f
commit 9d20d7e37f
2 changed files with 3 additions and 3 deletions

View File

@ -41,7 +41,7 @@ $Packages | % {
# Convert back the exceptions and remove the -E
$filename = (($filename -creplace '_xp([_.])', '-XP$1') -creplace '_nwjs([_.])', '_NWJS$1') -creplace '_e([_.])', '$1'
# Remove the version number
$filename = $filename -replace '_[0-9.]+(-_.)', '$1'
$filename = $filename -replace '_[0-9.]+([-_.])', '$1'
# Put back together
$renamed_file = "$directory$filename"
if ($file -ne $renamed_file) {
@ -49,8 +49,8 @@ $Packages | % {
}
# Replace absolute path with relative, and normalize to forward slashes
$renamed_file = $renamed_file -replace '^.*?([\\/]bld)', '.$1' -replace '[\\/]', '/'
"Copying $renamed_file to $target..."
& "C:\Program Files\Git\usr\bin\scp.exe" @('-o', 'StrictHostKeyChecking=no', '-i', "$keyfile", "$renamed_file", "ci@download.kiwix.org:$target")
"Copied $renamed_file to $target"
}
}
""

View File

@ -37,7 +37,7 @@ for file in ./bld/Electron/* ; do
if [[ "$file" != "$renamed_file" ]]; then
mv "$file" "$renamed_file"
fi
echo "Copying $renamed_file to $target"
scp -o StrictHostKeyChecking=no -i ./scripts/ssh_key "$renamed_file" ci@download.kiwix.org:$target
echo "Copied $renamed_file to $target"
fi
done