gnucash-on-windows master: Fix htmlhelp workshop installation errors
Geert Janssens
gjanssens at code.gnucash.org
Tue Apr 30 11:39:32 EDT 2019
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/e8c752fa (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/b64957ec (commit)
commit e8c752fa545080c53a023d1775f966d46149a931
Author: Geert Janssens <geert at kobaltwit.be>
Date: Tue Apr 30 17:34:53 2019 +0200
Fix htmlhelp workshop installation errors
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 5f70b5f..e61916f 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -173,7 +173,7 @@ $html_help_workshop_installer = "htmlhelp.exe"
$installed_hh = get-item -path "hkcu:\SOFTWARE\Microsoft\HTML Help Workshop" | foreach-object{$_.GetValue("InstallDir")}
if (! (($installed_hh) -and (test-path -path $installed_hh))) {
- install-package -url $html_help_workshop_url -download_file "$download_dir\\$html_help_workshop_installer" -install_dir ${env:ProgramFiles(x86)} -setup_cmd $html_help_installer
+ install-package -url $html_help_workshop_url -download_file "$download_dir\\$html_help_workshop_installer" -install_dir ${env:ProgramFiles(x86)} -setup_cmd $html_help_workshop_installer
}
$hhctrl_ocx = "c:\Windows\System32\hhctrl.ocx"
if (!(test-path -path $hhctrl_ocx)) {
@@ -273,7 +273,7 @@ if (!(test-path -path $htmlhelp_h)) {
$installed_hh = get-item -path "hkcu:\SOFTWARE\Microsoft\HTML Help Workshop" | foreach-object{$_.GetValue("InstallDir")}
}
$installed_hh = make-unixpath -path $installed_hh
- if (!installed_hh) {
+ if (!$installed_hh) {
Write-Host @"
****** ERROR ****
There was an error installing HTML Help Workshop. This will prevent building the documentation. If you didn't before, run setup-mingw64.ps1 in a PowerShell instance with Administrative priviledge. If you did that already, you may need to install HTML Help Workshop by hand.
Summary of changes:
setup-mingw64.ps1 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
More information about the gnucash-changes
mailing list