diff --git a/.github/workflows/build-electron.yml b/.github/workflows/build-electron.yml index ebd2040d..9a6d6179 100644 --- a/.github/workflows/build-electron.yml +++ b/.github/workflows/build-electron.yml @@ -83,15 +83,16 @@ jobs: # If file doesn't exist in FS, download it if [ ! -f "archives/$packagedFile" ]; then # Generalize the name if cron_launched and download it - echo -e "\nDownloading https://download.kiwix.org/zim/$packagedFile" if [[ $CRON_LAUNCHED = true ]]; then packagedFileGeneric=$(sed -E 's/_[0-9-]+(\.zim)/\1/' <<<"$packagedFile") + echo -e "\nDownloading https://download.kiwix.org/zim/$packagedFileGeneric" wget -nv "https://download.kiwix.org/zim/$packagedFileGeneric" -O "archives/$packagedFile" else flavour=$(sed -E 's/^([^_]+)_.+$/\1/' <<<"$packagedFile") if [[ $flavour = "mdwiki" ]]; then flavour='other' fi + echo -e "\nDownloading https://mirror.download.kiwix.org/zim/$flavour/$packagedFile" wget -nv "https://mirror.download.kiwix.org/zim/$flavour/$packagedFile" -O "archives/$packagedFile" fi fi @@ -178,15 +179,16 @@ jobs: } if ($packagedFile -and ! (Test-Path "archives\$packagedFile" -PathType Leaf)) { # File not in archives, so generalize the name (if nightly) and download it - Write-Host "`nDownloading https://download.kiwix.org/zim/$packagedFile" if ($CRON_LAUNCHED) { $packagedFileGeneric = $packagedFile -replace '_[0-9-]+(\.zim)', '$1' + Write-Host "`nDownloading https://download.kiwix.org/zim/$packagedFileGeneric" Invoke-WebRequest "https://download.kiwix.org/zim/$packagedFileGeneric" -OutFile "archives\$packagedFile" } else { $flavour = $packagedFile -replace '^([^_]+)_.+$', '$1' if ($flavour -eq 'mdwiki') { $flavour = 'other' } + Write-Host "`nDownloading https://mirror.download.kiwix.org/zim/$flavour/$packagedFile" Invoke-WebRequest "https://mirror.download.kiwix.org/zim/$flavour/$packagedFile" -OutFile "archives\$packagedFile" } } @@ -383,15 +385,16 @@ jobs: } if ($packagedFile -and ! (Test-Path "archives\$packagedFile" -PathType Leaf)) { # File not in archives, so generalize the name (if nightly) and download it - Write-Host "`nDownloading https://download.kiwix.org/zim/$packagedFile" if ($CRON_LAUNCHED) { $packagedFileGeneric = $packagedFile -replace '_[0-9-]+(\.zim)', '$1' + Write-Host "`nDownloading https://download.kiwix.org/zim/$packagedFileGeneric" Invoke-WebRequest "https://download.kiwix.org/zim/$packagedFileGeneric" -OutFile "archives\$packagedFile" } else { $flavour = $packagedFile -replace '^([^_]+)_.+$', '$1' if ($flavour -eq 'mdwiki') { $flavour = 'other' } + Write-Host "`nDownloading https://mirror.download.kiwix.org/zim/$flavour/$packagedFile" Invoke-WebRequest "https://mirror.download.kiwix.org/zim/$flavour/$packagedFile" -OutFile "archives\$packagedFile" } }