diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml index 49b4773a..710eebd4 100644 --- a/.github/workflows/package.yaml +++ b/.github/workflows/package.yaml @@ -7,7 +7,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-latest, ubuntu-latest] + os: [windows-latest] steps: - uses: actions/checkout@v2 with: diff --git a/build.gradle b/build.gradle index 09a08a2b..41943abd 100644 --- a/build.gradle +++ b/build.gradle @@ -145,6 +145,11 @@ jlink { if(os.windows) { installerOptions += ['--win-per-user-install', '--win-dir-chooser', '--win-menu', '--win-shortcut'] 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) { installerOptions += ['--mac-sign', '--mac-signing-key-user-name', 'Craig Raw (UPLVMSK9D7)'] diff --git a/drongo b/drongo index 17773f78..bd964e9b 160000 --- a/drongo +++ b/drongo @@ -1 +1 @@ -Subproject commit 17773f783e3d76262c578bc15e0b86d1d2fbebaa +Subproject commit bd964e9bd2dca849f0f444d5a40ca65a5eb20fa8 diff --git a/src/main/deploy/package/linux/sparrow.png b/src/main/deploy/package/linux/sparrow.png new file mode 100644 index 00000000..cf3c9e3e Binary files /dev/null and b/src/main/deploy/package/linux/sparrow.png differ diff --git a/src/main/java/com/sparrowwallet/sparrow/io/Hwi.java b/src/main/java/com/sparrowwallet/sparrow/io/Hwi.java index 5675a8fc..e1fd8a26 100644 --- a/src/main/java/com/sparrowwallet/sparrow/io/Hwi.java +++ b/src/main/java/com/sparrowwallet/sparrow/io/Hwi.java @@ -212,17 +212,19 @@ public class Hwi { hwiExecutable = tempExec; } else { InputStream inputStream; + Path tempExecPath; if(platform == Platform.WINDOWS) { inputStream = Hwi.class.getResourceAsStream("/external/windows/hwi.exe"); + tempExecPath = Files.createTempFile(TEMP_FILE_PREFIX, null); } else { 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(); - //tempExec.deleteOnExit(); + tempExec.deleteOnExit(); OutputStream tempExecStream = new BufferedOutputStream(new FileOutputStream(tempExec)); - ByteStreams.copy(new GZIPInputStream(inputStream), tempExecStream); + ByteStreams.copy(inputStream, tempExecStream); inputStream.close(); tempExecStream.flush(); tempExecStream.close(); diff --git a/src/main/resources/com/sparrowwallet/sparrow/app.css b/src/main/resources/com/sparrowwallet/sparrow/app.css index 99e937c6..cf63043a 100644 --- a/src/main/resources/com/sparrowwallet/sparrow/app.css +++ b/src/main/resources/com/sparrowwallet/sparrow/app.css @@ -20,7 +20,7 @@ -fx-fill: #383a42; } -.status-bar .status-label { +.status-bar, .status-bar .status-label { -fx-alignment: center-left; } diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 2130aac8..5abd8741 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -5,8 +5,12 @@ + + sparrow + + - ${user.home}/.sparrow/sparrow.log + ${appDir}/sparrow.log %date %level [%thread] %logger{10} [%file:%line] %msg%n