diff --git a/scripts/Publish-ElectronPackages.ps1 b/scripts/Publish-ElectronPackages.ps1 index fe8bab67..ef9116a9 100644 --- a/scripts/Publish-ElectronPackages.ps1 +++ b/scripts/Publish-ElectronPackages.ps1 @@ -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" } } "" diff --git a/scripts/publish_linux_packages_to_kiwix.sh b/scripts/publish_linux_packages_to_kiwix.sh index 8ecfcaeb..3a59db13 100644 --- a/scripts/publish_linux_packages_to_kiwix.sh +++ b/scripts/publish_linux_packages_to_kiwix.sh @@ -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 \ No newline at end of file