From ebe388f57a4f39748f4814b7d37544bcd8f76afc Mon Sep 17 00:00:00 2001
From: kali <kali@win>
Date: Tue, 3 Jul 2018 01:52:06 +0200
Subject: add tap-installer

---
 win/template.nsi | 73 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 39 insertions(+), 34 deletions(-)

(limited to 'win/template.nsi')

diff --git a/win/template.nsi b/win/template.nsi
index 7870606..1abe472 100755
--- a/win/template.nsi
+++ b/win/template.nsi
@@ -1,4 +1,7 @@
-!include "MUI.nsh"
+SetCompressor /SOLID lzma
+
+!define PRODUCT_PUBLISHER "LEAP Encryption Access Project"
+!include "MUI2.nsh"
 
 Name "$app_name"
 Outfile "..\dist\$app_name-installer.exe"
@@ -6,53 +9,40 @@ Outfile "..\dist\$app_name-installer.exe"
 InstallDir "C:\Program Files\$app_name\"
 RequestExecutionLevel admin
 
+!include FileFunc.nsh
+!insertmacro GetParameters
+!insertmacro GetOptions
+
+;Macros
+
+!macro SelectByParameter SECT PARAMETER DEFAULT
+	${GetOptions} $R0 "/${PARAMETER}=" $0
+	${If} ${DEFAULT} == 0
+		${If} $0 == 1
+			!insertmacro SelectSection ${SECT}
+		${EndIf}
+	${Else}
+		${If} $0 != 0
+			!insertmacro SelectSection ${SECT}
+		${EndIf}
+	${EndIf}
+!macroend
+
 
 !define BITMAP_FILE riseupvpn.bmp
-!define MUI_PAGE_CUSTOMFUNCTION_PRE WelcomePageSetupLinkPre
-!define MUI_PAGE_CUSTOMFUNCTION_SHOW WelcomePageSetupLinkShow
 
 !define MUI_ICON "..\assets\$app_name_lower.ico"
 !define MUI_UNICON "..\assets\$app_name_lower.ico"
 
 !define MUI_WELCOMEPAGE_TITLE "$app_name"
-!define MUI_WELCOMEPAGE_TEXT "This will install $app_name in your computer. $app_name is a simple VPN Client, powered by Bitmask."
+!define MUI_WELCOMEPAGE_TEXT "This will install $app_name in your computer. $app_name is a simple, fast and secure VPN Client, powered by Bitmask. \n This VPN service is run by donations from people like you."
 #!define MUI_WELCOMEFINISHPAGE_BITMAP "riseup.png"
 
 !insertmacro MUI_PAGE_WELCOME
-#!insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
 !insertmacro MUI_PAGE_FINISH
  
  
-Function WelcomePageSetupLinkPre
-  File "..\assets\$app_name_lower.png"
-  File "..\assets\$app_name_lower.ico"
-
-  !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "4" ; increase counter
-  !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Bottom" "122" ; limit size of the upper label
-  !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Type" "Link"
-  !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Text" "$url"
-  !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "State" "$url"
-  !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Left" "120"
-  !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Right" "315"
-  !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "123"
-  !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "132"
-FunctionEnd
- 
-Function WelcomePageSetupLinkShow
-  ; Thanks to pengyou
-  ; Fix colors of added link control
-  ; See http://forums.winamp.com/showthread.php?s=&threadid=205674
-  Push $0
- 
-  GetDlgItem $0 $MUI_HWND 1203
-  SetCtlColors $0 "0000FF" "FFFFFF"
-  ; underline font
-  CreateFont $1 "$(^Font)" "$(^FontSize)" "400" /UNDERLINE 
-  SendMessage $0 ${WM_SETFONT} $1 1 
-  Pop $0
- 
-FunctionEnd
 
 Section "InstallFiles"
   SetOutPath $INSTDIR 
@@ -82,6 +72,17 @@ Section "InstallService"
   Delete "C:\$app_name_lower.png"
 SectionEnd
 
+Section /o "TAP Virtual Ethernet Adapter" SecTAP
+	; Adapted from the windows nsis installer from OpenVPN (openvpn-build repo).
+	DetailPrint "Installing TAP (may need confirmation)..."
+  	ExecWait '"$INSTDIR\tap-windows.exe" /SELECT_UTILITIES=1'
+	;Making it explicit for now. It looks like the /S flag is "silent", isn't it?
+  	;ExecWait '"$INSTDIR\tap-windows.exe" /S /SELECT_UTILITIES=1'
+	Pop $R0 # return value/error/timeout
+	WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$app_name" "tap" "installed"
+	DetailPrint "TAP installed!"
+SectionEnd
+
 Section "Uninstall"
   ExecWait '"$INSTDIR"\nssm.exe stop $app_name_lower-helper'
   ExecWait '"$INSTDIR"\nssm.exe remove $app_name_lower-helper confirm'
@@ -95,6 +96,10 @@ Section "Uninstall"
   Delete $INSTDIR\uninstall.exe
 SectionEnd
 
+Function .onInit
+	!insertmacro SelectByParameter ${SecTAP} SELECT_TAP 1
+FunctionEnd
+
 ;----------------------------------------
 ;Languages
  
-- 
cgit v1.2.3