Merge pull request #116 from rdymac/patch-15

“Every time” is always two separate words.

diff --git a/app.fil b/app.fil
index 5266edb..600b603 100644 (file)
--- a/app.fil
+++ b/app.fil
@@ -1,2 +1,3 @@
 lib/gui_qt.py
 lib/gui.py
+lib/gui_lite.py

diff --git a/contrib/build-wine/build-electrum.sh b/contrib/build-wine/build-electrum.sh
index 1f025fb..a54e29a 100755 (executable)
--- a/contrib/build-wine/build-electrum.sh
+++ b/contrib/build-wine/build-electrum.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # You probably need to update only this link
-ELECTRUM_URL=https://github.com/downloads/spesmilo/electrum/Electrum-1.6.1.tar.gz
+ELECTRUM_URL=http://electrum.bitcoin.cz/download/Electrum-1.6.1.tar.gz
 NAME_ROOT=electrum-1.6.1
 
 # These settings probably don't need any change

diff --git a/contrib/build-wine/electrum.nsis b/contrib/build-wine/electrum.nsis
index 2a8b7e9..4694555 100644 (file)
--- a/contrib/build-wine/electrum.nsis
+++ b/contrib/build-wine/electrum.nsis
@@ -17,7 +17,7 @@
   InstallDirRegKey HKCU "Software\Electrum" ""
 
   ;Request application privileges for Windows Vista
-  RequestExecutionLevel user
+  RequestExecutionLevel admin
 
 ;--------------------------------
 ;Variables

diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh
index e407db4..ae71321 100755 (executable)
--- a/contrib/build-wine/prepare-wine.sh
+++ b/contrib/build-wine/prepare-wine.sh
@@ -19,7 +19,7 @@ set -e
 
 # Clean up Wine environment
 echo "Cleaning $WINEPREFIX"
-rm -rf $WINEPREFIX
+rm -rf $WINEPREFIX/*
 echo "done"
 
 echo "Cleaning tmp"