fixed directory flatening issue

nsis/cwtch-installer-suf.nsi

@@ -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

nsis/cwtch-installer.nsi

@@ -1,3 +1,5 @@
+; USAGE: Run in ui/deploy, requires the output be in 'windows' directory
+
 !include "MUI2.nsh"
 
 ; General settings ----------------------------
@@ -18,21 +20,21 @@ RequestExecutionLevel admin ;Require admin rights on NT6+ (When UAC is turned on
 InstallDir "$PROGRAMFILES\Cwtch"
 
 ;Get installation folder from registry if available
-InstallDirRegKey HKCU "Software\Cwtch" ""
+InstallDirRegKey HKCU "Software\Cwtch" "installLocation"
 
 ; MUI Interface -----------------------------
 
 !define MUI_INSTALLCOLORS "DFB9DE 281831"
 
-!define MUI_ICON "..\..\nsis\knot.ico"
+!define MUI_ICON "..\nsis\knot.ico"
 
 
 !define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "..\..\nsis\cwtch_title.bmp"
+!define MUI_HEADERIMAGE_BITMAP "..\nsis\cwtch_title.bmp"
 
 !define MUI_TEXTCOLOR "350052"
 
-!define MUI_WELCOMEFINISHPAGE_BITMAP "..\..\nsis\brand_side.bmp"
+!define MUI_WELCOMEFINISHPAGE_BITMAP "..\nsis\brand_side.bmp"
 !define MUI_WELCOMEFINISHPAGE_BITMAP_STRETCH NoStretchNoCrop
 
 !define MUI_INSTFILESPAGE_COLORS "DFB9DE 281831"
@@ -52,13 +54,13 @@ ShowInstDetails show
 
 !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_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_LICENSE "../LICENSE"
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
 !insertmacro MUI_PAGE_FINISH
@@ -76,3 +78,14 @@ Section
     # 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

nsis/gen-installer-nsi.sh

@@ -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