mirror of
https://github.com/sparrowwallet/sparrow.git
synced 2024-11-04 21:36:45 +00:00
windows fixes
This commit is contained in:
parent
0a094332d2
commit
ba017b2fcb
7 changed files with 18 additions and 7 deletions
2
.github/workflows/package.yaml
vendored
2
.github/workflows/package.yaml
vendored
|
@ -7,7 +7,7 @@ jobs:
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [windows-latest, ubuntu-latest]
|
os: [windows-latest]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
|
|
|
@ -145,6 +145,11 @@ jlink {
|
||||||
if(os.windows) {
|
if(os.windows) {
|
||||||
installerOptions += ['--win-per-user-install', '--win-dir-chooser', '--win-menu', '--win-shortcut']
|
installerOptions += ['--win-per-user-install', '--win-dir-chooser', '--win-menu', '--win-shortcut']
|
||||||
imageOptions += ['--icon', 'src/main/deploy/package/windows/sparrow.ico']
|
imageOptions += ['--icon', 'src/main/deploy/package/windows/sparrow.ico']
|
||||||
|
installerType = "exe"
|
||||||
|
}
|
||||||
|
if(os.linux) {
|
||||||
|
installerOptions += ['--linux-shortcut']
|
||||||
|
imageOptions += ['--icon', 'src/main/deploy/package/linux/sparrow.png']
|
||||||
}
|
}
|
||||||
if(os.macOsX) {
|
if(os.macOsX) {
|
||||||
installerOptions += ['--mac-sign', '--mac-signing-key-user-name', 'Craig Raw (UPLVMSK9D7)']
|
installerOptions += ['--mac-sign', '--mac-signing-key-user-name', 'Craig Raw (UPLVMSK9D7)']
|
||||||
|
|
2
drongo
2
drongo
|
@ -1 +1 @@
|
||||||
Subproject commit 17773f783e3d76262c578bc15e0b86d1d2fbebaa
|
Subproject commit bd964e9bd2dca849f0f444d5a40ca65a5eb20fa8
|
BIN
src/main/deploy/package/linux/sparrow.png
Normal file
BIN
src/main/deploy/package/linux/sparrow.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 43 KiB |
|
@ -212,17 +212,19 @@ public class Hwi {
|
||||||
hwiExecutable = tempExec;
|
hwiExecutable = tempExec;
|
||||||
} else {
|
} else {
|
||||||
InputStream inputStream;
|
InputStream inputStream;
|
||||||
|
Path tempExecPath;
|
||||||
if(platform == Platform.WINDOWS) {
|
if(platform == Platform.WINDOWS) {
|
||||||
inputStream = Hwi.class.getResourceAsStream("/external/windows/hwi.exe");
|
inputStream = Hwi.class.getResourceAsStream("/external/windows/hwi.exe");
|
||||||
|
tempExecPath = Files.createTempFile(TEMP_FILE_PREFIX, null);
|
||||||
} else {
|
} else {
|
||||||
inputStream = Hwi.class.getResourceAsStream("/external/" + platform.getPlatformId().toLowerCase() + "/hwi");
|
inputStream = Hwi.class.getResourceAsStream("/external/" + platform.getPlatformId().toLowerCase() + "/hwi");
|
||||||
|
tempExecPath = Files.createTempFile(TEMP_FILE_PREFIX, null, PosixFilePermissions.asFileAttribute(ownerExecutableWritable));
|
||||||
}
|
}
|
||||||
|
|
||||||
Path tempExecPath = Files.createTempFile(TEMP_FILE_PREFIX, null, PosixFilePermissions.asFileAttribute(ownerExecutableWritable));
|
|
||||||
File tempExec = tempExecPath.toFile();
|
File tempExec = tempExecPath.toFile();
|
||||||
//tempExec.deleteOnExit();
|
tempExec.deleteOnExit();
|
||||||
OutputStream tempExecStream = new BufferedOutputStream(new FileOutputStream(tempExec));
|
OutputStream tempExecStream = new BufferedOutputStream(new FileOutputStream(tempExec));
|
||||||
ByteStreams.copy(new GZIPInputStream(inputStream), tempExecStream);
|
ByteStreams.copy(inputStream, tempExecStream);
|
||||||
inputStream.close();
|
inputStream.close();
|
||||||
tempExecStream.flush();
|
tempExecStream.flush();
|
||||||
tempExecStream.close();
|
tempExecStream.close();
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
-fx-fill: #383a42;
|
-fx-fill: #383a42;
|
||||||
}
|
}
|
||||||
|
|
||||||
.status-bar .status-label {
|
.status-bar, .status-bar .status-label {
|
||||||
-fx-alignment: center-left;
|
-fx-alignment: center-left;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -5,8 +5,12 @@
|
||||||
<logger name="com.github.sarxos.webcam.ds.cgt.WebcamOpenTask" level="OFF"/>
|
<logger name="com.github.sarxos.webcam.ds.cgt.WebcamOpenTask" level="OFF"/>
|
||||||
<logger name="com.github.sarxos.webcam.ds.cgt.WebcamCloseTask" level="OFF"/>
|
<logger name="com.github.sarxos.webcam.ds.cgt.WebcamCloseTask" level="OFF"/>
|
||||||
|
|
||||||
|
<define name="appDir" class="com.sparrowwallet.drongo.PropertyDefiner">
|
||||||
|
<application>sparrow</application>
|
||||||
|
</define>
|
||||||
|
|
||||||
<appender name="FILE" class="ch.qos.logback.core.FileAppender">
|
<appender name="FILE" class="ch.qos.logback.core.FileAppender">
|
||||||
<file>${user.home}/.sparrow/sparrow.log</file>
|
<file>${appDir}/sparrow.log</file>
|
||||||
<encoder>
|
<encoder>
|
||||||
<pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>
|
<pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>
|
||||||
</encoder>
|
</encoder>
|
||||||
|
|
Loading…
Reference in a new issue