diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh index 2abb575fe..279b364da 100755 --- a/contrib/build-wine/build-electrum-git.sh +++ b/contrib/build-wine/build-electrum-git.sh @@ -44,7 +44,7 @@ cp electrum-git/LICENCE . # Build Qt resources wine $WINEPREFIX/drive_c/Python26/Lib/site-packages/PyQt4/pyrcc4.exe C:/electrum/icons.qrc -o C:/electrum/lib/icons_rc.py -# Copy ZBar libraries to electrum +# Copy ZBar libraries to electrum #cp "$WINEPREFIX/drive_c/Program Files (x86)/ZBar/bin/"*.dll "$WINEPREFIX/drive_c/electrum/" cd .. diff --git a/contrib/build-wine/build-electrum.sh b/contrib/build-wine/build-electrum.sh index f4d91d73a..99272cdf3 100755 --- a/contrib/build-wine/build-electrum.sh +++ b/contrib/build-wine/build-electrum.sh @@ -23,7 +23,7 @@ rm -rf $WINEPREFIX/drive_c/electrum cp electrum/LICENCE . mv electrum $WINEPREFIX/drive_c -# Copy ZBar libraries to electrum +# Copy ZBar libraries to electrum #cp "$WINEPREFIX/drive_c/Program Files (x86)/ZBar/bin/"*.dll "$WINEPREFIX/drive_c/electrum/" cd .. diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec index 96922fe0e..330b72315 100644 --- a/contrib/build-wine/deterministic.spec +++ b/contrib/build-wine/deterministic.spec @@ -5,7 +5,7 @@ a = Analysis(['electrum', 'gui/qt/main_window.py', 'gui/qt/lite_window.py', 'gui 'lib/util.py', 'lib/wallet.py', 'lib/simple_config.py', 'lib/bitcoin.py' ], - hiddenimports=["lib","gui"], + hiddenimports=["lib","gui"], pathex=['lib:gui:plugins'], hookspath=None) diff --git a/contrib/build-wine/electrum.nsi b/contrib/build-wine/electrum.nsi index 9b2aab7be..4a41c8f3e 100644 --- a/contrib/build-wine/electrum.nsi +++ b/contrib/build-wine/electrum.nsi @@ -12,7 +12,7 @@ ;Default installation folder InstallDir "$PROGRAMFILES\Electrum" - + ;Get installation folder from registry if available InstallDirRegKey HKCU "Software\Electrum" "" @@ -33,22 +33,22 @@ ;!insertmacro MUI_PAGE_LICENSE "tmp/LICENCE" ;!insertmacro MUI_PAGE_COMPONENTS !insertmacro MUI_PAGE_DIRECTORY - + ;Start Menu Folder Page Configuration - !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" - !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Electrum" + !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" + !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Electrum" !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" - + ;!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder - + !insertmacro MUI_PAGE_INSTFILES - + !insertmacro MUI_UNPAGE_CONFIRM !insertmacro MUI_UNPAGE_INSTFILES ;-------------------------------- ;Languages - + !insertmacro MUI_LANGUAGE "English" ;-------------------------------- @@ -57,13 +57,13 @@ Section SetOutPath "$INSTDIR" - + ;ADD YOUR OWN FILES HERE... file /r dist\electrum\*.* - + ;Store installation folder WriteRegStr HKCU "Software\Electrum" "" $INSTDIR - + ;Create uninstaller WriteUninstaller "$INSTDIR\Uninstall.exe" @@ -84,7 +84,7 @@ SectionEnd ;!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN ; !insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy) ;!insertmacro MUI_FUNCTION_DESCRIPTION_END - + ;-------------------------------- ;Uninstaller Section @@ -94,11 +94,11 @@ Section "Uninstall" RMDir /r "$INSTDIR\*.*" RMDir "$INSTDIR" - + Delete "$DESKTOP\Electrum.lnk" Delete "$SMPROGRAMS\Electrum\*.*" RmDir "$SMPROGRAMS\Electrum" - + DeleteRegKey /ifempty HKCU "Software\Electrum" SectionEnd