diff --git a/package.json b/package.json
index ea4c6883..c71cc5a1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "kiwix-js-windows",
"productName": "Kiwix JS Windows",
- "version": "1.2.4E",
+ "version": "1.2.6E",
"description": "Kiwix JS Windows packaged for the Electron framework",
"main": "main.js",
"build": {
@@ -23,7 +23,10 @@
"target": [
{
"target": "AppImage",
- "arch": "ia32"
+ "arch": [
+ "x64",
+ "ia32"
+ ]
}
]
},
@@ -42,9 +45,10 @@
"scripts": {
"start": "electron .",
"dist": "electron-builder build",
+ "dist-linux": "electron-builder build --linux",
"package-mac": "electron-packager . kiwix-js-windows --overwrite --platform=darwin --arch=x64 --icon=assets/icons/mac/icon.icns --prune=true --out=release-builds",
"package-win": "electron-packager . kiwix-js-windows --electron-version='10.4.0' --ignore=archives --ignore=AppPackages --ignore=BundleArtifacts --ignore=images$ --ignore=bin$ --ignore=bld$ --ignore=KiwixWebApp.* --ignore=[pP]ackage.[aSl] --ignore=node_ --ignore=[.]git[hi][ug][bn] --ignore=[.]vs$ --ignore=vscode --overwrite --platform=win32 --arch=ia32 --icon=www/img/icons/kiwix-64.ico --prune=true --out=bld/electron --version-string.CompanyName=Kiwix --version-string.FileDescription='Kiwix JS ZIM File Reader' --version-string.ProductName='Kiwix JS Windows Electron Edition'",
- "postpackage-win": "(robocopy archives bld\\Electron\\kiwix-js-windows-win32-ia32\\archives\\ > null) ^& IF %ERRORLEVEL% LSS 8 SET ERRORLEVEL = 0",
+ "postpackage-win": "(robocopy archives bld\\Electron\\kiwix-js-windows-win32-ia32\\resources\\app\\archives\\ > null) ^& IF %ERRORLEVEL% LSS 8 SET ERRORLEVEL = 0",
"package-linux": "electron-packager . kiwix-js-windows --overwrite --platform=linux --icon=www/img/icons/kiwix-64.png --electron-version='10.4.0' --ignore=archives --ignore=AppPackages --ignore=BundleArtifacts --ignore=images$ --ignore=bin$ --ignore=bld$ --ignore=KiwixWebApp.* --ignore=[pP]ackage.[aSl] --ignore=node_ --ignore=[.]git[hi][ug][bn] --ignore=[.]vs$ --ignore=vscode --overwrite --arch=x64 --prune=true --out=bld/electron --version-string.CompanyName=Kiwix --version-string.FileDescription='Kiwix JS ZIM File Reader' --version-string.ProductName='Kiwix JS WikiMed Electron Edition'",
"postpackage-linux": "(robocopy archives bld\\Electron\\kiwix-js-windows-linux-x64\\archives\\ > null) ^& IF %ERRORLEVEL% LSS 8 SET ERRORLEVEL = 0"
},
diff --git a/scripts/Create-DraftRelease.ps1 b/scripts/Create-DraftRelease.ps1
index e0b907ac..f88ad1d0 100644
--- a/scripts/Create-DraftRelease.ps1
+++ b/scripts/Create-DraftRelease.ps1
@@ -52,7 +52,7 @@ if ($base_tag -match '[EN]$') {
$title_flavour = 'NWJS'
$branch = 'nwjs-en-top'
}
- $release_title = $release_title -replace '([^\s]+)\sUWP$', ("$title_flavour Edition for Win7/Win8/Win10 " + '$1')
+ $release_title = $release_title -replace '([^\s]+)\sUWP$', ("$title_flavour Edition (Window/Linux) " + '$1')
if ($flavour -eq '_N') { $release_title = $release_title -replace 'Edition\s(for\s)', '$1XP/Vista/' }
}
"Text tag: $text_tag"
@@ -91,6 +91,15 @@ if (-Not $dryrun) {
# Check that we appear to have created a release
if ($dryrun -or $release.assets_url -imatch '^https:') {
"The draft release details were successfully created.`n"
+ "Updating release version in package.json"
+ $json_object = Get-Content -Raw "$PSScriptRoot/../package.json"
+ $json_object = $json_object -replace '("version": ")[^"]+', "`${1}$base_tag"
+ if ($dryrun) {
+ "[DRYRUN] would have written:`n"
+ $json_object
+ } else {
+ Set-Content "$PSScriptRoot/../package.json" $json_object
+ }
"Searching for assets..."
if ($flavour -eq '_E') {
$base_dir = "$PSScriptRoot/../bld/electron/"
diff --git a/www/A/Wikipedia%3AWikiProject_Medicine/Open_Textbook_of_Medicine b/www/A/Wikipedia%3AWikiProject_Medicine/Open_Textbook_of_Medicine
index 240f5efb..57d115a0 100644
--- a/www/A/Wikipedia%3AWikiProject_Medicine/Open_Textbook_of_Medicine
+++ b/www/A/Wikipedia%3AWikiProject_Medicine/Open_Textbook_of_Medicine
@@ -120,28 +120,29 @@
• Coronavirus party
• COVID-19 in USA
• COVID-19 in Brazil
- • COVID-19 in México
- • COVID-19 in Russia
• COVID-19 in India
- • COVID-19 in the UK
+ • COVID-19 in México
+ • COVID-19 in the UK
• COVID-19 in Italy
- • COVID-19 in France
+ • COVID-19 in Russia
+ • COVID-19 in France
• COVID-19 in Germany
• COVID-19 in Spain
• COVID-19 in Colombia
• COVID-19 in Iran
- • COVID-19 in Argentina
• COVID-19 in Poland
+ • COVID-19 in Argentina
• COVID-19 in Perú
• COVID-19 in South Africa
- • COVID-19 in Indonesia
- • COVID-19 in Ukraine
+ • COVID-19 in Ukraine
+ • COVID-19 in Indonesia
• COVID-19 in Bangladesh
• COVID-19 in Czech Republic
• COVID-19 in Romania
+ • COVID-19 in Hungary
• COVID-19 in Chile
- • COVID-19 in Belgium
• COVID-19 in Canada
+ • COVID-19 in Belgium
• COVID-19 in China