Skip to content

Commit feb1a8c

Browse files
committed
Merge #17308: nsis: Write to correct filename in first place
3b3b931 nsis: Write to correct filename in first place (Carl Dong) Pull request description: Per MarcoFalke's suggestion here bitcoin/bitcoin#17029 (comment) ACKs for top commit: MarcoFalke: unsigned ACK 3b3b931, makes sense to name it that way because it will raise the "unsinged" error in Windows Tree-SHA512: da72aae438505e162d0b3cd27d873b7ad8176178bb459a738e61b6e2ad0fa739d905b3109fab641bb1a3950fe59ad526c5568d12cf48a305166cdb7db6686543
2 parents 08e2947 + 3b3b931 commit feb1a8c

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

contrib/gitian-descriptors/gitian-win.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,7 @@ script: |
145145
make ${MAKEOPTS} -C src check-security
146146
make deploy
147147
make install DESTDIR=${INSTALLPATH}
148-
(
149-
SETUP_EXE="$(basename "$(echo ./*-setup.exe)")"
150-
cp -f "$SETUP_EXE" "${OUTDIR}/${SETUP_EXE/%-setup.exe/-setup-unsigned.exe}"
151-
)
148+
cp -f --target-directory="${OUTDIR}" ./bitcoin-*-setup-unsigned.exe
152149
cd installed
153150
mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
154151
find . -name "lib*.la" -delete

share/setup.nsi.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Var StartMenuGroup
4848
!insertmacro MUI_LANGUAGE English
4949

5050
# Installer attributes
51-
OutFile @abs_top_srcdir@/@PACKAGE_TARNAME@-@PACKAGE_VERSION@-win@[email protected]
51+
OutFile @abs_top_srcdir@/@PACKAGE_TARNAME@-@PACKAGE_VERSION@-win@WINDOWS_BITS@-setup-unsigned.exe
5252
!if "@WINDOWS_BITS@" == "64"
5353
InstallDir $PROGRAMFILES64\Bitcoin
5454
!else

0 commit comments

Comments
 (0)