sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-25 05:06:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

unpack hwi to all executable file permissions

Browse source
This commit is contained in:
Craig Raw 2021-03-14 12:59:01 +02:00
parent 1a5e71f852
commit 5853eb01f5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/com/sparrowwallet/sparrow/io/Hwi.java
View file

@ -224,7 +224,7 @@ public class Hwi {
if(hwiExecutable == null || !hwiExecutable.exists()) { if(hwiExecutable == null || !hwiExecutable.exists()) {
try { try {
Platform platform = Platform.getCurrent(); Platform platform = Platform.getCurrent();
Set<PosixFilePermission> ownerExecutableWritable = PosixFilePermissions.fromString("rwxr--r--"); Set<PosixFilePermission> allExecutableWritable = PosixFilePermissions.fromString("rwxrwxrwx");
//A PyInstaller --onefile expands into a new directory on every run triggering OSX Gatekeeper checks. //A PyInstaller --onefile expands into a new directory on every run triggering OSX Gatekeeper checks.
//To avoid doing these with every invocation, use a --onedir packaging and expand into a temp folder on OSX //To avoid doing these with every invocation, use a --onedir packaging and expand into a temp folder on OSX
@ -232,7 +232,7 @@ public class Hwi {
//See https://github.com/bitcoin-core/HWI/issues/327 for details //See https://github.com/bitcoin-core/HWI/issues/327 for details
if(platform == Platform.OSX) { if(platform == Platform.OSX) {
InputStream inputStream = Hwi.class.getResourceAsStream("/native/osx/x64/" + VERSION_PREFIX + "-mac-amd64-signed.zip"); InputStream inputStream = Hwi.class.getResourceAsStream("/native/osx/x64/" + VERSION_PREFIX + "-mac-amd64-signed.zip");
Path tempHwiDirPath = Files.createTempDirectory(VERSION_PREFIX, PosixFilePermissions.asFileAttribute(ownerExecutableWritable)); Path tempHwiDirPath = Files.createTempDirectory(VERSION_PREFIX, PosixFilePermissions.asFileAttribute(allExecutableWritable));
File tempHwiDir = tempHwiDirPath.toFile(); File tempHwiDir = tempHwiDirPath.toFile();
//tempHwiDir.deleteOnExit(); //tempHwiDir.deleteOnExit();
log.debug("Using temp HWI path: " + tempHwiDir.getAbsolutePath()); log.debug("Using temp HWI path: " + tempHwiDir.getAbsolutePath());
@ -242,9 +242,9 @@ public class Hwi {
ZipEntry zipEntry = zis.getNextEntry(); ZipEntry zipEntry = zis.getNextEntry();
while(zipEntry != null) { while(zipEntry != null) {
if(zipEntry.isDirectory()) { if(zipEntry.isDirectory()) {
newDirectory(tempHwiDir, zipEntry, ownerExecutableWritable); newDirectory(tempHwiDir, zipEntry, allExecutableWritable);
} else { } else {
File newFile = newFile(tempHwiDir, zipEntry, ownerExecutableWritable); File newFile = newFile(tempHwiDir, zipEntry, allExecutableWritable);
//newFile.deleteOnExit(); //newFile.deleteOnExit();
FileOutputStream fos = new FileOutputStream(newFile); FileOutputStream fos = new FileOutputStream(newFile);
ByteStreams.copy(zis, new FileOutputStream(newFile)); ByteStreams.copy(zis, new FileOutputStream(newFile));
@ -270,7 +270,7 @@ public class Hwi {
tempExecPath = Files.createTempFile(VERSION_PREFIX, null); tempExecPath = Files.createTempFile(VERSION_PREFIX, null);
} else { } else {
inputStream = Hwi.class.getResourceAsStream("/native/linux/x64/hwi"); inputStream = Hwi.class.getResourceAsStream("/native/linux/x64/hwi");
tempExecPath = Files.createTempFile(VERSION_PREFIX, null, PosixFilePermissions.asFileAttribute(ownerExecutableWritable)); tempExecPath = Files.createTempFile(VERSION_PREFIX, null, PosixFilePermissions.asFileAttribute(allExecutableWritable));
} }
File tempExec = tempExecPath.toFile(); File tempExec = tempExecPath.toFile();