updated NSIS file

1 files changed, 86 insertions, 107 deletions

diff --git a/setup/onionshare.nsi b/setup/onionshare.nsi
index 654a0b64..ad9a4570 100644
--- a/setup/onionshare.nsi
+++ b/setup/onionshare.nsi
@@ -3,7 +3,7 @@
 !define ABOUTURL "https://github.com/micahflee/onionshare"

 

 # change these with each release

-!define INSTALLSIZE 46124

+!define INSTALLSIZE 31008

 !define VERSIONMAJOR 0

 !define VERSIONMINOR 5

 !define VERSIONSTRING "0.5dev"

@@ -36,14 +36,14 @@ ${EndIf}
 !macroend

 

 Function .onInit

-	setShellVarContext all

-	!insertmacro VerifyUserIsAdmin

+    setShellVarContext all

+    !insertmacro VerifyUserIsAdmin

 FunctionEnd

 

 Section "install"

     # application

-	SetOutPath "$INSTDIR"

-	File "onionshare.ico"

+    SetOutPath "$INSTDIR"

+    File "onionshare.ico"

     File "${BINPATH}\onionshare.exe"

     File "${BINPATH}\LICENSE"

     SetOutPath "$INSTDIR\onionshare"

@@ -57,8 +57,6 @@ Section "install"
     SetOutPath "$INSTDIR\onionshare_gui"

     File "${BINPATH}\onionshare_gui\onionshare_gui.py"

     File "${BINPATH}\onionshare_gui\onionshare_gui.pyc"

-    File "${BINPATH}\onionshare_gui\webapp.py"

-    File "${BINPATH}\onionshare_gui\webapp.pyc"

     File "${BINPATH}\onionshare_gui\__init__.py"

     File "${BINPATH}\onionshare_gui\__init__.pyc"

     SetOutPath "$INSTDIR\onionshare_gui\static"

@@ -67,101 +65,92 @@ Section "install"
 

     # dependencies

     SetOutPath $INSTDIR

-    File "${BINPATH}\LIBEAY32.dll"

-    File "${BINPATH}\QtOpenGL4.dll"

-    File "${BINPATH}\unicodedata.pyd"

-    File "${BINPATH}\sip.pyd"

-    File "${BINPATH}\pywintypes27.dll"

-    File "${BINPATH}\SSLEAY32.dll"

-    File "${BINPATH}\msvcr90.dll"

-    File "${BINPATH}\QtSvg4.dll"

-    File "${BINPATH}\msvcp90.dll"

-    File "${BINPATH}\QtCore4.dll"

+    File "${BINPATH}\_ctypes.pyd"

+    File "${BINPATH}\_hashlib.pyd"

+    File "${BINPATH}\_socket.pyd"

+    File "${BINPATH}\_ssl.pyd"

     File "${BINPATH}\bz2.pyd"

+    File "${BINPATH}\Microsoft.VC90.CRT.manifest"

+    File "${BINPATH}\msvcm90.dll"

+    File "${BINPATH}\msvcp90.dll"

+    File "${BINPATH}\msvcr90.dll"

+    File "${BINPATH}\onionshare.exe.manifest"

+    File "${BINPATH}\pyexpat.pyd"

     File "${BINPATH}\PyQt4.QtCore.pyd"

-    File "${BINPATH}\PyQt4.QtNetwork.pyd"

-    File "${BINPATH}\QtNetwork4.dll"

-    File "${BINPATH}\_ctypes.pyd"

-    File "${BINPATH}\PyQt4.QtWebKit.pyd"

     File "${BINPATH}\PyQt4.QtGui.pyd"

-    File "${BINPATH}\win32wnet.pyd"

-    File "${BINPATH}\win32api.pyd"

-    File "${BINPATH}\pyexpat.pyd"

     File "${BINPATH}\python27.dll"

-    File "${BINPATH}\msvcm90.dll"

-    File "${BINPATH}\_hashlib.pyd"

-    File "${BINPATH}\win32pipe.pyd"

-    File "${BINPATH}\QtWebKit4.dll"

-    File "${BINPATH}\onionshare.exe.manifest"

-    File "${BINPATH}\select.pyd"

-    File "${BINPATH}\Microsoft.VC90.CRT.manifest"

+    File "${BINPATH}\pywintypes27.dll"

+    File "${BINPATH}\QtCore4.dll"

     File "${BINPATH}\QtGui4.dll"

-    File "${BINPATH}\_ssl.pyd"

-    File "${BINPATH}\_socket.pyd"

+    File "${BINPATH}\QtOpenGL4.dll"

+    File "${BINPATH}\QtSvg4.dll"

     File "${BINPATH}\QtXml4.dll"

+    File "${BINPATH}\select.pyd"

+    File "${BINPATH}\sip.pyd"

+    File "${BINPATH}\unicodedata.pyd"

+    File "${BINPATH}\win32api.pyd"

+    File "${BINPATH}\win32pipe.pyd"

+    File "${BINPATH}\win32wnet.pyd"

     SetOutPath "$INSTDIR\qt4_plugins\accessible"

     File "${BINPATH}\qt4_plugins\accessible\qtaccessiblewidgets4.dll"

-    SetOutPath "$INSTDIR\qt4_plugins\graphicssystems"

-    File "${BINPATH}\qt4_plugins\graphicssystems\qglgraphicssystem4.dll"

-    SetOutPath "$INSTDIR\qt4_plugins\bearer"

-    File "${BINPATH}\qt4_plugins\bearer\qnativewifibearer4.dll"

-    File "${BINPATH}\qt4_plugins\bearer\qgenericbearer4.dll"

-    SetOutPath "$INSTDIR\qt4_plugins\iconengines"

-    File "${BINPATH}\qt4_plugins\iconengines\qsvgicon4.dll"

     SetOutPath "$INSTDIR\qt4_plugins\codecs"

+    File "${BINPATH}\qt4_plugins\codecs\qcncodecs4.dll"

     File "${BINPATH}\qt4_plugins\codecs\qjpcodecs4.dll"

     File "${BINPATH}\qt4_plugins\codecs\qkrcodecs4.dll"

     File "${BINPATH}\qt4_plugins\codecs\qtwcodecs4.dll"

-    File "${BINPATH}\qt4_plugins\codecs\qcncodecs4.dll"

+    SetOutPath "$INSTDIR\qt4_plugins\graphicssystems"

+    File "${BINPATH}\qt4_plugins\graphicssystems\qglgraphicssystem4.dll"

+    SetOutPath "$INSTDIR\qt4_plugins\iconengines"

+    File "${BINPATH}\qt4_plugins\iconengines\qsvgicon4.dll"

     SetOutPath "$INSTDIR\qt4_plugins\imageformats"

-    File "${BINPATH}\qt4_plugins\imageformats\qmng4.dll"

-    File "${BINPATH}\qt4_plugins\imageformats\qico4.dll"

     File "${BINPATH}\qt4_plugins\imageformats\qgif4.dll"

+    File "${BINPATH}\qt4_plugins\imageformats\qico4.dll"

     File "${BINPATH}\qt4_plugins\imageformats\qjpeg4.dll"

+    File "${BINPATH}\qt4_plugins\imageformats\qmng4.dll"

     File "${BINPATH}\qt4_plugins\imageformats\qsvg4.dll"

     File "${BINPATH}\qt4_plugins\imageformats\qtga4.dll"

     File "${BINPATH}\qt4_plugins\imageformats\qtiff4.dll"

     SetOutPath "$INSTDIR\Include"

     File "${BINPATH}\Include\pyconfig.h"

 

-	# uninstaller

-	WriteUninstaller "$INSTDIR\uninstall.exe"

-

-	# start menu

-	CreateShortCut "$SMPROGRAMS\${APPNAME}.lnk" "$INSTDIR\onionshare.exe" "" "$INSTDIR\onionshare.ico"

-

-	# registry information for add/remove programs

-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}"

-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""

-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"

-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "InstallLocation" "$\"$INSTDIR$\""

-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$\"$INSTDIR\onionshare.ico$\""

-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "URLInfoAbout" "$\"${ABOUTURL}$\""

-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" ${VERSIONSTRING}

-	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "VersionMajor" ${VERSIONMAJOR}

-	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "VersionMinor" ${VERSIONMINOR}

-	# there is no option for modifying or repairing the install

-	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" 1

-	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" 1

-	# set the INSTALLSIZE constant (!defined at the top of this script) so Add/Remove Programs can accurately report the size

-	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "EstimatedSize" ${INSTALLSIZE}

+    # uninstaller

+    WriteUninstaller "$INSTDIR\uninstall.exe"

+

+    # start menu

+    CreateShortCut "$SMPROGRAMS\${APPNAME}.lnk" "$INSTDIR\onionshare.exe" "" "$INSTDIR\onionshare.ico"

+

+    # registry information for add/remove programs

+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}"

+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""

+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"

+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "InstallLocation" "$\"$INSTDIR$\""

+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$\"$INSTDIR\onionshare.ico$\""

+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "URLInfoAbout" "$\"${ABOUTURL}$\""

+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" ${VERSIONSTRING}

+    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "VersionMajor" ${VERSIONMAJOR}

+    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "VersionMinor" ${VERSIONMINOR}

+    # there is no option for modifying or repairing the install

+    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" 1

+    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" 1

+    # set the INSTALLSIZE constant (!defined at the top of this script) so Add/Remove Programs can accurately report the size

+    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "EstimatedSize" ${INSTALLSIZE}

 SectionEnd

 

 # uninstaller

 Function un.onInit

-	SetShellVarContext all

+    SetShellVarContext all

 

-	#Verify the uninstaller - last chance to back out

-	MessageBox MB_OKCANCEL "Uninstall ${APPNAME}?" IDOK next

-		Abort

-	next:

-	!insertmacro VerifyUserIsAdmin

+    #Verify the uninstaller - last chance to back out

+    MessageBox MB_OKCANCEL "Uninstall ${APPNAME}?" IDOK next

+        Abort

+    next:

+    !insertmacro VerifyUserIsAdmin

 FunctionEnd

 

 Section "uninstall"

-	Delete "$SMPROGRAMS\${APPNAME}.lnk"

+    Delete "$SMPROGRAMS\${APPNAME}.lnk"

 

-	# remove files

+    # remove files

     Delete "$INSTDIR\onionshare.exe"

     Delete "$INSTDIR\LICENSE"

     Delete "$INSTDIR\onionshare.ico"

@@ -180,12 +169,8 @@ Section "uninstall"
     Delete "$INSTDIR\onionshare_gui\static\loader.gif"

     Delete "$INSTDIR\onionshare_gui\onionshare_gui.py"

     Delete "$INSTDIR\onionshare_gui\onionshare_gui.pyc"

-    Delete "$INSTDIR\onionshare_gui\webapp.py"

-    Delete "$INSTDIR\onionshare_gui\webapp.pyc"

     Delete "$INSTDIR\qt4_plugins\accessible\qtaccessiblewidgets4.dll"

     Delete "$INSTDIR\qt4_plugins\graphicssystems\qglgraphicssystem4.dll"

-    Delete "$INSTDIR\qt4_plugins\bearer\qnativewifibearer4.dll"

-    Delete "$INSTDIR\qt4_plugins\bearer\qgenericbearer4.dll"

     Delete "$INSTDIR\qt4_plugins\iconengines\qsvgicon4.dll"

     Delete "$INSTDIR\qt4_plugins\codecs\qjpcodecs4.dll"

     Delete "$INSTDIR\qt4_plugins\codecs\qkrcodecs4.dll"

@@ -198,45 +183,39 @@ Section "uninstall"
     Delete "$INSTDIR\qt4_plugins\imageformats\qsvg4.dll"

     Delete "$INSTDIR\qt4_plugins\imageformats\qtga4.dll"

     Delete "$INSTDIR\qt4_plugins\imageformats\qtiff4.dll"

-    Delete "$INSTDIR\LIBEAY32.dll"

-    Delete "$INSTDIR\QtOpenGL4.dll"

-    Delete "$INSTDIR\unicodedata.pyd"

-    Delete "$INSTDIR\sip.pyd"

-    Delete "$INSTDIR\pywintypes27.dll"

-    Delete "$INSTDIR\SSLEAY32.dll"

-    Delete "$INSTDIR\msvcr90.dll"

-    Delete "$INSTDIR\QtSvg4.dll"

-    Delete "$INSTDIR\msvcp90.dll"

-    Delete "$INSTDIR\QtCore4.dll"

+    Delete "$INSTDIR\Include\pyconfig.h"

+    Delete "$INSTDIR\_ctypes.pyd"

+    Delete "$INSTDIR\_hashlib.pyd"

+    Delete "$INSTDIR\_socket.pyd"

+    Delete "$INSTDIR\_ssl.pyd"

     Delete "$INSTDIR\bz2.pyd"

+    Delete "$INSTDIR\Microsoft.VC90.CRT.manifest"

+    Delete "$INSTDIR\msvcm90.dll"

+    Delete "$INSTDIR\msvcp90.dll"

+    Delete "$INSTDIR\msvcr90.dll"

+    Delete "$INSTDIR\onionshare.exe.manifest"

+    Delete "$INSTDIR\pyexpat.pyd"

     Delete "$INSTDIR\PyQt4.QtCore.pyd"

-    Delete "$INSTDIR\PyQt4.QtNetwork.pyd"

-    Delete "$INSTDIR\QtNetwork4.dll"

-    Delete "$INSTDIR\_ctypes.pyd"

-    Delete "$INSTDIR\PyQt4.QtWebKit.pyd"

     Delete "$INSTDIR\PyQt4.QtGui.pyd"

-    Delete "$INSTDIR\win32wnet.pyd"

-    Delete "$INSTDIR\win32api.pyd"

-    Delete "$INSTDIR\pyexpat.pyd"

     Delete "$INSTDIR\python27.dll"

-    Delete "$INSTDIR\msvcm90.dll"

-    Delete "$INSTDIR\_hashlib.pyd"

-    Delete "$INSTDIR\Include\pyconfig.h"

-    Delete "$INSTDIR\win32pipe.pyd"

-    Delete "$INSTDIR\QtWebKit4.dll"

-    Delete "$INSTDIR\onionshare.exe.manifest"

-    Delete "$INSTDIR\select.pyd"

-    Delete "$INSTDIR\Microsoft.VC90.CRT.manifest"

+    Delete "$INSTDIR\pywintypes27.dll"

+    Delete "$INSTDIR\QtCore4.dll"

     Delete "$INSTDIR\QtGui4.dll"

-    Delete "$INSTDIR\_ssl.pyd"

-    Delete "$INSTDIR\_socket.pyd"

+    Delete "$INSTDIR\QtOpenGL4.dll"

+    Delete "$INSTDIR\QtSvg4.dll"

     Delete "$INSTDIR\QtXml4.dll"

+    Delete "$INSTDIR\select.pyd"

+    Delete "$INSTDIR\sip.pyd"

+    Delete "$INSTDIR\unicodedata.pyd"

+    Delete "$INSTDIR\win32api.pyd"

+    Delete "$INSTDIR\win32pipe.pyd"

+    Delete "$INSTDIR\win32wnet.pyd"

 

-	rmDir "$INSTDIR\onionshare"

+    rmDir "$INSTDIR\onionshare"

     rmDir "$INSTDIR\onionshare_gui\static"

     rmDir "$INSTDIR\onionshare_gui"

     rmDir "$INSTDIR\Include"

-	rmDir "$INSTDIR\qt4_plugins\accessible"

+    rmDir "$INSTDIR\qt4_plugins\accessible"

     rmDir "$INSTDIR\qt4_plugins\bearer"

     rmDir "$INSTDIR\qt4_plugins\codecs"

     rmDir "$INSTDIR\qt4_plugins\graphicssystems"

@@ -245,6 +224,6 @@ Section "uninstall"
     rmDir "$INSTDIR\qt4_plugins"

     rmDir "$INSTDIR"

 

-	# remove uninstaller information from the registry

-	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}"

+    # remove uninstaller information from the registry

+    DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}"

 SectionEnd