Skip to content

Commit

Permalink
Merge pull request #5 from SignalK/https-download
Browse files Browse the repository at this point in the history
fix: download nodejs in https
  • Loading branch information
cmotelet authored Jul 3, 2020
2 parents 7a5b483 + d6aef95 commit 1509ff4
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 9 deletions.
14 changes: 7 additions & 7 deletions NSIS/signalk-server.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
!include "MUI2.nsh"
;======================================================
;General
!define INST_VERSION "0.3.1"
!define INST_VERSION "0.3.2"
BrandingText "Signal K from http://signalk.org/"
Name "Signal K installer ${INST_VERSION}"
OutFile "..\output\signalk-server-setup-${INST_VERSION}.exe"
Expand Down Expand Up @@ -53,8 +53,8 @@
StrCpy $OPENSSL_PATH '$INSTDIR\openssl'
StrCpy $OPENSSL_BIN_PATH '$INSTDIR\openssl\bin'
StrCpy $TOOLS_PATH '$INSTDIR\tools'
StrCpy $NODE64_URL 'http://nodejs.org/dist/v10.19.0/node-v10.19.0-win-x64.7z'
StrCpy $NODE86_URL 'http://nodejs.org/dist/v10.19.0/node-v10.19.0-win-x86.7z'
StrCpy $NODE64_URL 'https://nodejs.org/dist/v10.19.0/node-v10.19.0-win-x64.7z'
StrCpy $NODE86_URL 'https://nodejs.org/dist/v10.19.0/node-v10.19.0-win-x86.7z'
StrCpy $NODE64_ORG_DIR 'node-v10.19.0-win-x64'
StrCpy $NODE86_ORG_DIR 'node-v10.19.0-win-x86'
FunctionEnd
Expand Down Expand Up @@ -287,20 +287,20 @@
SetOutPath $INSTDIR
${If} ${RunningX64}
DetailPrint "Download nodejs 64-bits"
NSISdl::download "$NODE64_URL" "$INSTDIR\nodejs.7z"
inetc::get "$NODE64_URL" "$INSTDIR\nodejs.7z" /END
${Else}
DetailPrint "Download nodejs 32-bits"
NSISdl::download "$NODE86_URL" "$INSTDIR\nodejs.7z"
inetc::get "$NODE86_URL" "$INSTDIR\nodejs.7z" /END
${EndIf}
Pop $R0 ;Get the return value
StrCmp $R0 "success" +3
StrCmp $R0 "OK" +3
MessageBox MB_OK "Download nodejs failed: $R0"
Quit
SetDetailsView show
DetailPrint "Extract nodejs"
Nsis7z::ExtractWithDetails "$INSTDIR\nodejs.7z" "Extracting nodejs package %s..."
Pop $R0
StrCmp $R0 "success" +3
StrCmp $R0 "OK" +3
MessageBox MB_OK "Extract nodejs failed: $R0"
Quit
${If} ${RunningX64}
Expand Down
Binary file added download/Inetc.zip
Binary file not shown.
14 changes: 13 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ___

**What's provide with this installer:**
- The latest version of the Signal K server downloaded during installation.
- node js 10.19.0 ( downloaded from http://nodejs.org/dist/v10.19.0/ during installation).
- node js 10.19.0 ( downloaded from https://nodejs.org/dist/v10.19.0/ during installation).
- openssl 1.1.1d ( from https://slproweb.com/products/Win32OpenSSL.html ).
- support of X64 and X86 Windows version (Windows 10 X64 and Windows 7 X86 tested).
- All packages are installed under a root directory. You choose your root directory at the time of installation.
Expand Down Expand Up @@ -93,3 +93,15 @@ Or ask for support at http://slack-invite.signalk.org/ in channel #support-windo
- First of all, if you installed as service, `Run as administrator` the `remove-signalk-server-services.cmd` script in tools dirrectory.
- You can then safely delete the root directory e.g. `c:\signalk`
- And that's all !

**Rebuild install kit
- Clone Github project: `git clone https://github.com/SignalK/signalk-server-windows.git`
- Install `nsis-3.05-setup.exe` located in download folder.
- Extract `Nsis7z_19.00.7z`
- Copy `Plugins\x86-ansi` & `Plugins\x86-unicode` content in the Plugins folder of NSIS install directory.
- Extract `Inetc.zip`
- Copy `Plugins\x86-ansi` & `Plugins\x86-unicode` content in the Plugins folder of NSIS install directory.
- Run NSIS.
- Open `NSIS\signalk-server.nsi` file in NSIS.
- Select `Script` `Recompile`
- The new compiled install kit is located in `output`directory.
15 changes: 14 additions & 1 deletion target/readme.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<p><strong>What&#39;s provide with this installer:</strong> </p>
<ul>
<li>The latest version of the Signal K server downloaded during installation. </li>
<li>node js 10.19.0 ( downloaded from <a href="http://nodejs.org/dist/v10.19.0/">http://nodejs.org/dist/v10.19.0/</a> during installation). </li>
<li>node js 10.19.0 ( downloaded from <a href="https://nodejs.org/dist/v10.19.0/">https://nodejs.org/dist/v10.19.0/</a> during installation). </li>
<li>openssl 1.1.1d ( from <a href="https://slproweb.com/products/Win32OpenSSL.html">https://slproweb.com/products/Win32OpenSSL.html</a> ). </li>
<li>support of X64 and X86 Windows version (Windows 10 X64 and Windows 7 X86 tested). </li>
<li>All packages are installed under a root directory. You choose your root directory at the time of installation. </li>
Expand Down Expand Up @@ -73,3 +73,16 @@
<li>You can then safely delete the root directory e.g. <code>c:\signalk</code> </li>
<li>And that&#39;s all ! </li>
</ul>
<p>**Rebuild install kit</p>
<ul>
<li>Clone Github project: <code>git clone https://github.com/SignalK/signalk-server-windows.git</code> </li>
<li>Install <code>nsis-3.05-setup.exe</code> located in download folder. </li>
<li>Extract <code>Nsis7z_19.00.7z</code> </li>
<li>Copy <code>Plugins\x86-ansi</code> &amp; <code>Plugins\x86-unicode</code> content in the Plugins folder of NSIS install directory. </li>
<li>Extract <code>Inetc.zip</code> </li>
<li>Copy <code>Plugins\x86-ansi</code> &amp; <code>Plugins\x86-unicode</code> content in the Plugins folder of NSIS install directory. </li>
<li>Run NSIS. </li>
<li>Open <code>NSIS\signalk-server.nsi</code> file in NSIS. </li>
<li>Select <code>Script</code> <code>Recompile</code></li>
<li>The new compiled install kit is located in <code>output</code>directory. </li>
</ul>

0 comments on commit 1509ff4

Please sign in to comment.