From 447e16fa23e9f8bcc1a69c8bf77c037f7a0cc7fa Mon Sep 17 00:00:00 2001 From: Jaifroid Date: Thu, 10 Jun 2021 21:48:06 +0100 Subject: [PATCH] Corrections Former-commit-id: 8626a84e3ba0b8d1fb91362a6d3f08b35c63c3f1 [formerly 4ce6eb20beb5adc9a871e536597d092bc429c3d5] [formerly d7c73962fdaaca9fc9c63ea1c7549dacf57553ba] [formerly f83f442ca8c23b67892ea012144ed87d8bd7a109 [formerly 1652f51f06da6bc752703ee5166b0dfcc3fce235 [formerly 86826e99294daa74498d9f524e776eff098823c1]]] Former-commit-id: 743ebcb2af26f6fe2d2b816a8e23d2a67ffdcd64 [formerly 1b7bb0e777b0e6fec1ef1c8039d0516aa945c68a [formerly 40ed4f772cca860691723c3822b71ad74b3bfd1b]] Former-commit-id: 9873eb936c562e5adb1b1fdecd0d549315b886ac [formerly 4aa6a205f186e96f10bf87447da9dd965b3555b9] Former-commit-id: 927aac38c6e7de49b40d8488b504cb90e0b12306 --- scripts/Create-DraftRelease.ps1 | 4 ++-- scripts/Kiwix_JS_Windows_E_Release_Body.md | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/Create-DraftRelease.ps1 b/scripts/Create-DraftRelease.ps1 index c37f7d87..f3651a2a 100644 --- a/scripts/Create-DraftRelease.ps1 +++ b/scripts/Create-DraftRelease.ps1 @@ -101,7 +101,7 @@ $release_params = @{ 'Accept' = 'application/vnd.github.everest-preview+json' } Body = @{ - 'tag_name' = $tag_name + 'tag_name' = "v$base_tag" 'target_commitish' = $branch 'name' = $release_title 'draft' = $true @@ -468,7 +468,7 @@ if ($dryrun -or $buildonly -or $release.assets_url -imatch '^https:') { if ($flavour -eq '_E') { $permalinkFile = $permalinkFile -replace 'uwp', 'electron' } "Looking for: $permalinkFile" $permalink = Get-Content -Raw $permalinkFile - $permalink = $permalink -replace 'v[\d.EN]{5,}[^"'']*', $tag_name + $permalink = $permalink -replace 'v[\d.EN]{5,}[^"'']*', "v$base_tag" $permalink = $permalink -replace '\s*$', "`n" if (-Not $dryrun) { Set-Content $permalinkFile $permalink } else { "`n[DRYRUN] would have written:`n$permalink`n" } diff --git a/scripts/Kiwix_JS_Windows_E_Release_Body.md b/scripts/Kiwix_JS_Windows_E_Release_Body.md index ae1df8e0..bbd98842 100644 --- a/scripts/Kiwix_JS_Windows_E_Release_Body.md +++ b/scripts/Kiwix_JS_Windows_E_Release_Body.md @@ -8,8 +8,8 @@ Choose the correct build: * **Windows**: - **Portable** (just unzip, no install needed) - + Windows 7/8/10 - [kiwix-js-windows-<>-win-ia32.zip](https://github.com/kiwix/kiwix-js-windows/releases/download/v<>/kiwix_js_windows-<>-win-ia32.zip) (NWJS) - _recommended_ - + Windows XP/Vista - [kiwix_js_windows-XP-<>-win-ia32.zip](https://github.com/kiwix/kiwix-js-windows/releases/download/v<>/kiwix_js_windows-XP-<>-win-ia32.zip) (NWJS) + + Windows 7/8/10 - [kiwix_js_windows-<>N-win-ia32.zip](https://github.com/kiwix/kiwix-js-windows/releases/download/v<>/kiwix_js_windows-<>N-win-ia32.zip) (NWJS) - _recommended_ + + Windows XP/Vista - [kiwix_js_windows-XP-<>N-win-ia32.zip](https://github.com/kiwix/kiwix-js-windows/releases/download/v<>/kiwix_js_windows-XP-<>N-win-ia32.zip) (NWJS) - **Installable** (signed NSIS installer) + Windows 7/8/10 - [Kiwix JS Windows Setup <>-E.exe](https://github.com/kiwix/kiwix-js-windows/releases/download/v<>/Kiwix.JS.PWA.Setup.<>-E.exe) (Electron) * **Linux**: @@ -18,7 +18,7 @@ Choose the correct build: + AppImage 32bit (Ubuntu, Debian) - [Kiwix JS PWA-<>-E-i386.AppImage](https://github.com/kiwix/kiwix-js-windows/releases/download/v<>/Kiwix.JS.PWA-<>-E-i386.AppImage) (Electron) - **Installable** + Deb package 64bit (Ubuntu, Debian) - [kiwix-js-pwa_<>-E_amd64.deb](https://github.com/kiwix/kiwix-js-windows/releases/download/v<>/kiwix-js-pwa_<>-E_amd64.deb) (Electron) - + Deb package 32bit (Ubuntu, Debian) - [kiwix-js-pwa_<>-E_i386.deb](https://github.com/kiwix/kiwix-js-windows/releases/download/v<>/kiwix-js-pwa_<>-E_i386.deb) + + Deb package 32bit (Ubuntu, Debian) - [kiwix-js-pwa_<>-E_i386.deb](https://github.com/kiwix/kiwix-js-windows/releases/download/v<>/kiwix-js-pwa_<>-E_i386.deb) (Electron) There is no installation required for the Portable versions. NONE of these builds auto-update (yet). Installation instructions are after the screenshot. @@ -26,7 +26,7 @@ There is no installation required for the Portable versions. NONE of these build ### Instructions: -* For the Windows Portable build, unzip the contents of the [kiwix_js_windows-<>-win-ia32.zip](https://github.com/kiwix/kiwix-js-windows/releases/download/v<>/kiwix_js_windows-<>-win-ia32.zip) archive to any folder, or to a flash drive / thumb drive, and double click on `Start Kiwix JS Windows` or `Start Kiwix JS Windows via batch file.bat`, or open the `kiwix-js-windows-win32-ia32` folder and double click on `nw.exe`; +* For the Windows Portable build, unzip the contents of the [kiwix_js_windows-<>-win-ia32.zip](https://github.com/kiwix/kiwix-js-windows/releases/download/v<>/kiwix_js_windows-<>N-win-ia32.zip) archive to any folder, or to a flash drive / thumb drive, and double click on `Start Kiwix JS Windows` or `Start Kiwix JS Windows via batch file.bat`, or open the `kiwix-js-windows-win32-ia32` folder and double click on `nw.exe`; * For the Windows Setup (installable) build, simply download and launch. It will install itself, together with a shortcut in your shortcut menu, and run. When you want to update the app, just install a new version over it (it will uninstall the old one for you). * For the Linux portable builds, download and save the correct AppImage file anywhere (e.g. your Desktop), and double-click it. If it doesn't work, open Terminal and run `chmod a+x Kiwix.JS.PWA*.AppImage` and then `./Kiwix.JS.PWA*.AppImage --no-sandbox`. You might be able to run without `--no-sandbox` (see https://github.com/electron/electron/issues/17972#issuecomment-516957971). * For the Linux installable builds, download the correct `.deb` package and double-click to see if your graphical package manager can install it. If not, open a terminal, `cd` to the directory containing the package, and type `sudo apt install ./kiwix-js-pwa*.deb`. Once installed, on Debian, you may have to run the app by opening terminal and typing `kiwix-js-pwa --no-sandbox`. On Ubuntu, you should be able to run it from its installed icon.