diff --git a/nsis/cwtch-installer-suf.nsi b/nsis/cwtch-installer-suf.nsi deleted file mode 100644 index 3370064a..00000000 --- a/nsis/cwtch-installer-suf.nsi +++ /dev/null @@ -1,11 +0,0 @@ -#FILESLISTEND - - - # create a shortcut named "new shortcut" in the start menu programs directory - # presently, the new shortcut doesn't call anything (the second field is blank) - CreateShortcut "$SMPROGRAMS\Cwtch.lnk" "$INSTDIR\ui.exe" - - ;Store installation folder - WriteRegStr HKCU "Software\Cwtch" "" $INSTDIR - -SectionEnd \ No newline at end of file diff --git a/nsis/cwtch-installer-pre.nsi b/nsis/cwtch-installer.nsi similarity index 75% rename from nsis/cwtch-installer-pre.nsi rename to nsis/cwtch-installer.nsi index 6bee3583..e1e2f7cd 100644 --- a/nsis/cwtch-installer-pre.nsi +++ b/nsis/cwtch-installer.nsi @@ -1,78 +1,91 @@ -!include "MUI2.nsh" - -; General settings ---------------------------- -Name "Cwtch" -; !define MUI_BRANDINGTEXT "SIG Beta Ver. 1.0" - -Unicode True - -# define the name of the installer -Outfile "cwtch-installer.exe" - -# For removing Start Menu shortcut in Windows 7 -#RequestExecutionLevel user -RequestExecutionLevel admin ;Require admin rights on NT6+ (When UAC is turned on) - -# define the directory to install to, the desktop in this case as specified -# by the predefined $DESKTOP variable -InstallDir "$PROGRAMFILES\Cwtch" - -;Get installation folder from registry if available -InstallDirRegKey HKCU "Software\Cwtch" "" - -; MUI Interface ----------------------------- - -!define MUI_INSTALLCOLORS "DFB9DE 281831" - -!define MUI_ICON "..\..\nsis\knot.ico" - - -!define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP "..\..\nsis\cwtch_title.bmp" - -!define MUI_TEXTCOLOR "350052" - -!define MUI_WELCOMEFINISHPAGE_BITMAP "..\..\nsis\brand_side.bmp" -!define MUI_WELCOMEFINISHPAGE_BITMAP_STRETCH NoStretchNoCrop - -!define MUI_INSTFILESPAGE_COLORS "DFB9DE 281831" -!define MUI_INSTFILESPAGE_PROGRESSBAR "colored" - -!define MUI_FINISHPAGE_NOAUTOCLOSE - - -ShowInstDetails show - -; Pages -------- - - -!define MUI_WELCOMEPAGE_TITLE "Welcome to the Cwtch installer" -!define MUI_WELCOMEPAGE_TEXT "Cwtch (pronounced: kutch) is a Welsh word roughly meaning 'a hug that creates a safe space'$\n$\n\ - Cwtch is a platform for building consentful, decentralized, untrusted infrastructure using metadata resistant group communication applications. Currently there is a selfnamed instant messaging prototype app that is driving development and testing. Many Further apps are planned as the platform matures." - -!define MUI_FINISHPAGE_TITLE "Enjoy Cwtch" -!define MUI_FINISHPAGE_RUN $INSTDIR/ui.exe -!define MUI_FINISHPAGE_TEXT "You can keep uptodate on Cwtch and report any issues you have at https://cwtch.im" -!define MUI_FINISHPAGE_LINK "https://cwtch.im" -!define MUI_FINISHPAGE_LINK_LOCATION "https://cwtch.im" -!define MUI_FINISHPAGE_LINK_COLOR "D01972" - -!insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "../../LICENSE" -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES -!insertmacro MUI_PAGE_FINISH - -; Languages -------------------------------- - -!insertmacro MUI_LANGUAGE "English" - -# default section -Section - - # define the output path for this file - SetOutPath $INSTDIR - - # define what to install and place it in the output path - # Filler for .sh to populate with contents of deploy/windows - #FILESLISTSTART +; USAGE: Run in ui/deploy, requires the output be in 'windows' directory + +!include "MUI2.nsh" + +; General settings ---------------------------- +Name "Cwtch" +; !define MUI_BRANDINGTEXT "SIG Beta Ver. 1.0" + +Unicode True + +# define the name of the installer +Outfile "cwtch-installer.exe" + +# For removing Start Menu shortcut in Windows 7 +#RequestExecutionLevel user +RequestExecutionLevel admin ;Require admin rights on NT6+ (When UAC is turned on) + +# define the directory to install to, the desktop in this case as specified +# by the predefined $DESKTOP variable +InstallDir "$PROGRAMFILES\Cwtch" + +;Get installation folder from registry if available +InstallDirRegKey HKCU "Software\Cwtch" "installLocation" + +; MUI Interface ----------------------------- + +!define MUI_INSTALLCOLORS "DFB9DE 281831" + +!define MUI_ICON "..\nsis\knot.ico" + + +!define MUI_HEADERIMAGE +!define MUI_HEADERIMAGE_BITMAP "..\nsis\cwtch_title.bmp" + +!define MUI_TEXTCOLOR "350052" + +!define MUI_WELCOMEFINISHPAGE_BITMAP "..\nsis\brand_side.bmp" +!define MUI_WELCOMEFINISHPAGE_BITMAP_STRETCH NoStretchNoCrop + +!define MUI_INSTFILESPAGE_COLORS "DFB9DE 281831" +!define MUI_INSTFILESPAGE_PROGRESSBAR "colored" + +!define MUI_FINISHPAGE_NOAUTOCLOSE + + +ShowInstDetails show + +; Pages -------- + + +!define MUI_WELCOMEPAGE_TITLE "Welcome to the Cwtch installer" +!define MUI_WELCOMEPAGE_TEXT "Cwtch (pronounced: kutch) is a Welsh word roughly meaning 'a hug that creates a safe space'$\n$\n\ + Cwtch is a platform for building consentful, decentralized, untrusted infrastructure using metadata resistant group communication applications. Currently there is a selfnamed instant messaging prototype app that is driving development and testing. Many Further apps are planned as the platform matures." + +!define MUI_FINISHPAGE_TITLE "Enjoy Cwtch" +!define MUI_FINISHPAGE_RUN $INSTDIR/ui.exe +!define MUI_FINISHPAGE_TEXT "You can keep up-to-date on Cwtch and report any issues you have at https://cwtch.im" +!define MUI_FINISHPAGE_LINK "https://cwtch.im" +!define MUI_FINISHPAGE_LINK_LOCATION "https://cwtch.im" +!define MUI_FINISHPAGE_LINK_COLOR "D01972" + +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE "../LICENSE" +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + +; Languages -------------------------------- + +!insertmacro MUI_LANGUAGE "English" + +# default section +Section + + # define the output path for this file + SetOutPath $INSTDIR + + # define what to install and place it in the output path + # Filler for .sh to populate with contents of deploy/windows + #FILESLISTSTART + FILE /r "windows\" + #FILESLISTEND + + + # create a shortcut in the start menu programs directory + CreateShortcut "$SMPROGRAMS\Cwtch.lnk" "$INSTDIR\ui.exe" + + ;Store installation folder + WriteRegStr HKCU "Software\Cwtch" "installLocation" $INSTDIR + +SectionEnd \ No newline at end of file diff --git a/nsis/gen-installer-nsi.sh b/nsis/gen-installer-nsi.sh deleted file mode 100644 index 37b41a89..00000000 --- a/nsis/gen-installer-nsi.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -find ../deploy/windows -type f | sed 's/^..\/deploy\/windows\//FILE "/' | sed 's/\//\\/g' | sed 's/$/"/' > fileslist #eol -cat cwtch-installer-pre.nsi > cwtch-installer-final.nsi #eol -cat fileslist >> cwtch-installer-final.nsi #eol -cat cwtch-installer-suf.nsi >> cwtch-installer-final.nsi #eol -#eof