electrum

commit 2da6a8d171540a97824765b9e74fd3fff096deb6
parent 4e4a7746fcb1af36d9d8bd92a4587d0056464599
Author: ThomasV <thomasv@electrum.org>
Date:   Mon, 11 Dec 2017 19:45:49 +0100

Merge pull request #3494 from bauerj/setup-det

Make setup.exe differ less
Diffstat:
M
contrib/build-wine/build-electrum-git.sh
 | 
3
++-
M
contrib/build-wine/build.sh
 | 
2
+-
M
contrib/build-wine/electrum.nsi
 | 
5
++---

3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh
@@ -45,6 +45,7 @@ popd
 pushd electrum
 VERSION=`git describe --tags`
 echo "Last commit: $VERSION"
+find -exec touch -d '2000-11-11T11:11:11+00:00' {} +
 popd
 
 rm -rf $WINEPREFIX/drive_c/electrum
@@ -69,7 +70,7 @@ wine "C:/python$PYTHON_VERSION/scripts/pyinstaller.exe" --noconfirm --ascii --na
 
 # set timestamps in dist, in order to make the installer reproducible
 pushd dist
-find  -type f  -exec touch -d '2000-11-11T11:11:11+00:00' {} +
+find -exec touch -d '2000-11-11T11:11:11+00:00' {} +
 popd
 
 # build NSIS installer
diff --git a/contrib/build-wine/build.sh b/contrib/build-wine/build.sh
@@ -15,7 +15,7 @@ $here/prepare-hw.sh || exit 1
 echo "Resetting modification time in C:\Python..."
 # (Because of some bugs in pyinstaller)
 pushd /opt/wine64/drive_c/python*
-find -type f -exec touch -d '2000-11-11T11:11:11+00:00' {} +
+find -exec touch -d '2000-11-11T11:11:11+00:00' {} +
 popd
 ls -l /opt/wine64/drive_c/python*
 
diff --git a/contrib/build-wine/electrum.nsi b/contrib/build-wine/electrum.nsi
@@ -72,7 +72,7 @@
   !define MUI_ABORTWARNING
   !define MUI_ABORTWARNING_TEXT "Are you sure you wish to abort the installation of ${PRODUCT_NAME}?"
   
-  !define MUI_ICON "..\..\icons\electrum.ico"
+  !define MUI_ICON "tmp\electrum\icons\electrum.ico"
   
 ;--------------------------------
 ;Pages
@@ -168,4 +168,4 @@ Section "Uninstall"
   DeleteRegKey HKCU "Software\Classes\bitcoin"
   DeleteRegKey HKCU "Software\${PRODUCT_NAME}"
   DeleteRegKey HKCU "${PRODUCT_UNINST_KEY}"
-SectionEnd-
\ No newline at end of file
+SectionEnd