mirror of
https://github.com/Cyrix126/gupaxx.git
synced 2024-12-22 14:49:21 +00:00
icons: custom icon per OS, build.rs, cargo-bundle
This commit is contained in:
hinto-janaiyo
parent
f83bf5e2cc
commit
20f5e2d917
20 changed files with 321 additions and 384 deletions
4
.gitmodules
vendored
4
.gitmodules
vendored
|
|
@ -1,3 +1,3 @@
|
||||||
[submodule "external/egui"]
|
[submodule "origin"]
|
||||||
path = external/egui
|
path = external/egui
|
||||||
url = https://github.com/emilk/egui
|
url = https://github.com/hinto-janaiyo/egui
|
||||||
|
|
|
||||||
121
Cargo.lock
generated
121
Cargo.lock
generated
|
|
@ -33,6 +33,18 @@ version = "1.0.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
|
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "aes"
|
||||||
|
version = "0.7.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if",
|
||||||
|
"cipher 0.3.0",
|
||||||
|
"cpufeatures",
|
||||||
|
"opaque-debug",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "aes"
|
name = "aes"
|
||||||
version = "0.8.2"
|
version = "0.8.2"
|
||||||
|
|
@ -40,7 +52,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241"
|
checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"cipher",
|
"cipher 0.4.3",
|
||||||
"cpufeatures",
|
"cpufeatures",
|
||||||
"zeroize",
|
"zeroize",
|
||||||
]
|
]
|
||||||
|
|
@ -410,6 +422,27 @@ version = "1.2.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
|
checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "bzip2"
|
||||||
|
version = "0.4.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0"
|
||||||
|
dependencies = [
|
||||||
|
"bzip2-sys",
|
||||||
|
"libc",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "bzip2-sys"
|
||||||
|
version = "0.1.11+1.0.8"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"libc",
|
||||||
|
"pkg-config",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "calloop"
|
name = "calloop"
|
||||||
version = "0.10.1"
|
version = "0.10.1"
|
||||||
|
|
@ -474,6 +507,15 @@ dependencies = [
|
||||||
"winapi",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cipher"
|
||||||
|
version = "0.3.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
|
||||||
|
dependencies = [
|
||||||
|
"generic-array",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cipher"
|
name = "cipher"
|
||||||
version = "0.4.3"
|
version = "0.4.3"
|
||||||
|
|
@ -594,6 +636,12 @@ version = "0.7.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"
|
checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "constant_time_eq"
|
||||||
|
version = "0.1.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "convert_case"
|
name = "convert_case"
|
||||||
version = "0.4.0"
|
version = "0.4.0"
|
||||||
|
|
@ -779,7 +827,7 @@ version = "0.9.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
|
checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cipher",
|
"cipher 0.4.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -1771,6 +1819,8 @@ dependencies = [
|
||||||
"toml",
|
"toml",
|
||||||
"tor-rtcompat",
|
"tor-rtcompat",
|
||||||
"walkdir",
|
"walkdir",
|
||||||
|
"winres",
|
||||||
|
"zip",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -2748,6 +2798,17 @@ dependencies = [
|
||||||
"windows-sys 0.42.0",
|
"windows-sys 0.42.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "password-hash"
|
||||||
|
version = "0.4.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
|
||||||
|
dependencies = [
|
||||||
|
"base64ct",
|
||||||
|
"rand_core 0.6.4",
|
||||||
|
"subtle",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "paste"
|
name = "paste"
|
||||||
version = "1.0.9"
|
version = "1.0.9"
|
||||||
|
|
@ -2760,6 +2821,18 @@ version = "0.2.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
|
checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pbkdf2"
|
||||||
|
version = "0.11.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
|
||||||
|
dependencies = [
|
||||||
|
"digest 0.10.5",
|
||||||
|
"hmac",
|
||||||
|
"password-hash",
|
||||||
|
"sha2 0.10.6",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pem"
|
name = "pem"
|
||||||
version = "0.8.3"
|
version = "0.8.3"
|
||||||
|
|
@ -3487,6 +3560,17 @@ dependencies = [
|
||||||
"digest 0.10.5",
|
"digest 0.10.5",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "sha1"
|
||||||
|
version = "0.10.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if",
|
||||||
|
"cpufeatures",
|
||||||
|
"digest 0.10.5",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sha2"
|
name = "sha2"
|
||||||
version = "0.9.9"
|
version = "0.9.9"
|
||||||
|
|
@ -4362,7 +4446,7 @@ version = "0.3.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "97db0224b69d341e34cefea7e58f63a42ed3def4e39182a68b007a4839294800"
|
checksum = "97db0224b69d341e34cefea7e58f63a42ed3def4e39182a68b007a4839294800"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aes",
|
"aes 0.8.2",
|
||||||
"arrayref",
|
"arrayref",
|
||||||
"base64",
|
"base64",
|
||||||
"ctr",
|
"ctr",
|
||||||
|
|
@ -4467,7 +4551,7 @@ dependencies = [
|
||||||
"arrayref",
|
"arrayref",
|
||||||
"asynchronous-codec",
|
"asynchronous-codec",
|
||||||
"bytes",
|
"bytes",
|
||||||
"cipher",
|
"cipher 0.4.3",
|
||||||
"coarsetime",
|
"coarsetime",
|
||||||
"derive_builder_fork_arti",
|
"derive_builder_fork_arti",
|
||||||
"digest 0.10.5",
|
"digest 0.10.5",
|
||||||
|
|
@ -5136,6 +5220,15 @@ dependencies = [
|
||||||
"winapi",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "winres"
|
||||||
|
version = "0.1.12"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c"
|
||||||
|
dependencies = [
|
||||||
|
"toml",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wio"
|
name = "wio"
|
||||||
version = "0.2.2"
|
version = "0.2.2"
|
||||||
|
|
@ -5233,6 +5326,26 @@ dependencies = [
|
||||||
"synstructure",
|
"synstructure",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "zip"
|
||||||
|
version = "0.6.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "537ce7411d25e54e8ae21a7ce0b15840e7bfcff15b51d697ec3266cc76bdf080"
|
||||||
|
dependencies = [
|
||||||
|
"aes 0.7.5",
|
||||||
|
"byteorder",
|
||||||
|
"bzip2",
|
||||||
|
"constant_time_eq",
|
||||||
|
"crc32fast",
|
||||||
|
"crossbeam-utils",
|
||||||
|
"flate2",
|
||||||
|
"hmac",
|
||||||
|
"pbkdf2",
|
||||||
|
"sha1",
|
||||||
|
"time 0.3.16",
|
||||||
|
"zstd",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zstd"
|
name = "zstd"
|
||||||
version = "0.11.2+zstd.1.5.2"
|
version = "0.11.2+zstd.1.5.2"
|
||||||
|
|
|
||||||
27
Cargo.toml
27
Cargo.toml
|
|
@ -18,9 +18,9 @@ egui_extras = { version = "0.19.0", features = ["image"] }
|
||||||
## There are many issue threads and PRs to fix it but for now,
|
## There are many issue threads and PRs to fix it but for now,
|
||||||
## this is here for convenience sake when I'm testing.
|
## this is here for convenience sake when I'm testing.
|
||||||
## The only change is [.with_srgb()] is set to [false].
|
## The only change is [.with_srgb()] is set to [false].
|
||||||
#eframe = { path = "egui/crates/eframe" }
|
#eframe = { path = "external/egui/crates/eframe" }
|
||||||
#egui = { path = "egui/crates/egui" }
|
#egui = { path = "external/egui/crates/egui" }
|
||||||
#egui_extras = { path = "egui/crates/egui_extras", features = ["image"] }
|
#egui_extras = { path = "external/egui/crates/egui_extras", features = ["image"] }
|
||||||
env_logger = "0.9.1"
|
env_logger = "0.9.1"
|
||||||
figment = { version = "0.10.8", features = ["toml"] }
|
figment = { version = "0.10.8", features = ["toml"] }
|
||||||
flate2 = "1.0"
|
flate2 = "1.0"
|
||||||
|
|
@ -48,17 +48,14 @@ tokio = { version = "1.21.2", features = ["full"] }
|
||||||
toml = "0.5.9"
|
toml = "0.5.9"
|
||||||
tor-rtcompat = "0.7.0"
|
tor-rtcompat = "0.7.0"
|
||||||
walkdir = "2.3.2"
|
walkdir = "2.3.2"
|
||||||
|
zip = "0.6.3"
|
||||||
|
|
||||||
[profile.optimized]
|
# For Windows
|
||||||
codegen-units = 1
|
[target.'cfg(windows)'.build-dependencies]
|
||||||
debug-assertions = false
|
winres = "0.1.12"
|
||||||
debug = false
|
|
||||||
incremental = true
|
|
||||||
inherits = "release"
|
|
||||||
lto = true
|
|
||||||
overflow-checks = false
|
|
||||||
rpath = false
|
|
||||||
strip = "debuginfo"
|
|
||||||
|
|
||||||
[profile.optimized.package."*"]
|
# For macOS (cargo-bundle)
|
||||||
opt-level = 3
|
[package.metadata.bundle]
|
||||||
|
identifier = "io.github.hinto-janaiyo.gupax"
|
||||||
|
icon = ["images/png/icon@2x.png"]
|
||||||
|
short_description = "GUI for P2Pool+XMRig"
|
||||||
|
|
|
||||||
14
README.md
14
README.md
|
|
@ -1,5 +1,5 @@
|
||||||
# Gupax - WORK IN PROGRESS
|
# Gupax - WORK IN PROGRESS
|
||||||
|
|
||||||
**Gupax** (*guh-picks*) is a cross-platform GUI for mining [**Monero**](https://github.com/monero-project/monero) on [**P2Pool**](https://github.com/SChernykh/p2pool), using [**XMRig**](https://github.com/xmrig/xmrig).
|
**Gupax** (*guh-picks*) is a cross-platform GUI for mining [**Monero**](https://github.com/monero-project/monero) on [**P2Pool**](https://github.com/SChernykh/p2pool), using [**XMRig**](https://github.com/xmrig/xmrig).
|
||||||
|
|
||||||
## Contents
|
## Contents
|
||||||
|
|
@ -47,7 +47,7 @@ Both Monero and P2Pool have built in miners but XMRig is quite faster than both
|
||||||
2. **Monero GUI** runs the ***Monero node***
|
2. **Monero GUI** runs the ***Monero node***
|
||||||
3. **Gupax** runs ***P2Pool/XMRig***
|
3. **Gupax** runs ***P2Pool/XMRig***
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
With Monero GUI managing the Monero node on one side and Gupax managing P2Pool/XMRig on the other, it is (hopefully) very easy for anyone to start mining Monero at **max hashrate in a decentralized, permissionless, and trustless manner**.
|
With Monero GUI managing the Monero node on one side and Gupax managing P2Pool/XMRig on the other, it is (hopefully) very easy for anyone to start mining Monero at **max hashrate in a decentralized, permissionless, and trustless manner**.
|
||||||
|
|
||||||
|
|
@ -88,13 +88,13 @@ https://user-images.githubusercontent.com/101352116/194763334-d8e936c9-a71e-474e
|
||||||
* A Monero node/wallet
|
* A Monero node/wallet
|
||||||
|
|
||||||
## Build
|
## Build
|
||||||
Optimized:
|
Windows/macOS/Linux:
|
||||||
```
|
```
|
||||||
cargo build --profile optimized
|
cargo build --release
|
||||||
```
|
```
|
||||||
Optimized for your specific CPU (15%~ speed increase, depending on your CPU):
|
On macOS, if you want the binary to have an icon in `Finder`, you must install [`cargo-bundle`](https://github.com/burtonageo/cargo-bundle) and compile with:
|
||||||
```
|
```
|
||||||
RUSTFLAGS="-C target-cpu=native" cargo build --profile optimized
|
cargo bundle --release
|
||||||
```
|
```
|
||||||
|
|
||||||
Add `--target x86_64-pc-windows-gnu` to build for Windows.
|
The `build.rs` file in the repo root sets the icon in `File Explorer` for Windows. The taskbar icon & App frame icon (for all OS's) get set at runtime using pre-compiled bytes in [`src/constants.rs`](https://github.com/hinto-janaiyo/gupax/blob/main/src/constants.rs) from [`images`](https://github.com/hinto-janaiyo/gupax/blob/main/images).
|
||||||
|
|
|
||||||
10
build.rs
Executable file
10
build.rs
Executable file
|
|
@ -0,0 +1,10 @@
|
||||||
|
// This [build.rs] is for setting Windows icons.
|
||||||
|
// The icon in [File Explorer] gets set here.
|
||||||
|
// The icon in the taskbar and top of the App window gets
|
||||||
|
// set in [src/main.rs, src/constants.rs] at runtime with
|
||||||
|
// pre-compiled bytes using [include_bytes!()] on the images in [images/].
|
||||||
|
fn main() -> std::io::Result<()> {
|
||||||
|
#[cfg(windows)]
|
||||||
|
winres::WindowsResource::new().set_icon("images/icons/icon.ico").compile()?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
20
build.sh
20
build.sh
|
|
@ -1,20 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
[[ $PWD = */gupax ]]
|
|
||||||
|
|
||||||
if [[ $1 = *all* ]]; then
|
|
||||||
echo "=== building all ==="
|
|
||||||
echo "=== windows ==="
|
|
||||||
cargo build --profile optimized --target x86_64-pc-windows-gnu
|
|
||||||
# echo "=== macos ==="
|
|
||||||
# cargo build --profile optimized --target x86_64-apple-darwin
|
|
||||||
echo "=== linux ==="
|
|
||||||
cargo build --profile optimized
|
|
||||||
du -hs target/x86_64-pc-windows-gnu/optimized/gupax target/x86_64-apple-darwin/optimized/gupax target/optimized/gupax
|
|
||||||
else
|
|
||||||
echo "=== building linux cpu optimized ==="
|
|
||||||
RUSTFLAGS="-C target-cpu=native" cargo build --profile optimized
|
|
||||||
du -hs target/optimized/gupax
|
|
||||||
fi
|
|
||||||
2
external/egui
vendored
2
external/egui
vendored
|
|
@ -1 +1 @@
|
||||||
Subproject commit 457c951951c19193afde16d1a4ac3c17a70518be
|
Subproject commit 62b4d427c01201898914594a9d00d1576bc23432
|
||||||
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 1.3 MiB After Width: | Height: | Size: 1.3 MiB |
70
images/ferris/panic.svg
Normal file
70
images/ferris/panic.svg
Normal file
|
|
@ -0,0 +1,70 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||||
|
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||||
|
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||||
|
width="1434.979px" height="947px" viewBox="0 0 1434.979 947" enable-background="new 0 0 1434.979 947" xml:space="preserve">
|
||||||
|
<!--<rect fill="#FFFFFF" width="1434.979" height="947"/>-->
|
||||||
|
<path fill="#8F1F1D" d="M712.827,368.579c-131.633,0-251.228,15.825-339.77,41.615v220.298
|
||||||
|
c88.542,25.79,208.137,41.614,339.77,41.614c150.657,0,285.535-20.729,376.134-53.402V421.986
|
||||||
|
C998.361,389.311,863.483,368.579,712.827,368.579"/>
|
||||||
|
<path fill="#8F1F1D" d="M1094.847,567.972c-3.856-10.663-4.629-24.154-1.36-37.162c5.85-23.289,22.421-36.198,37.013-28.833
|
||||||
|
c3.618,1.827,6.773,4.73,9.387,8.418c0.239-0.001,0.479,0,0.715,0.016c0,0,44.552,53.106,3.313,116.003
|
||||||
|
c-0.896,3.569-76.534,91.718-94.043,94.524C1038.411,722.773,1064.762,630.939,1094.847,567.972"/>
|
||||||
|
<path fill="#8F1F1D" d="M363.903,557.551c5.3-9.631,7.158-22.788,4.217-36.426c-5.266-24.416-23.91-41.109-41.642-37.285
|
||||||
|
c-4.398,0.948-8.325,3.072-11.666,6.099c-0.282-0.059-0.564-0.113-0.845-0.153c0,0-56.292,41.952-12.057,113.924
|
||||||
|
c0.805,3.741,83.851,108.838,104.311,115.764C419.612,724.004,394.974,626.947,363.903,557.551"/>
|
||||||
|
<path fill="#E23A26" d="M284.891,563.596l0.007,0.015C285.083,563.755,285.255,563.887,284.891,563.596"/>
|
||||||
|
<path fill="#E33B26" d="M1180.543,488.433c-0.88-3.064-1.756-6.126-2.662-9.162l30.683-44.451c3.13-4.522,3.771-10.398,1.73-15.555
|
||||||
|
c-2.04-5.13-6.49-8.81-11.76-9.71l-51.887-8.805c-2.008-4.102-4.115-8.142-6.229-12.15l21.797-49.903
|
||||||
|
c2.243-5.087,1.769-10.995-1.203-15.608c-2.961-4.636-7.99-7.344-13.349-7.133l-52.656,1.913c-2.727-3.55-5.496-7.068-8.322-10.521
|
||||||
|
l12.102-53.49c1.225-5.433-0.322-11.118-4.104-15.064c-3.762-3.932-9.229-5.559-14.426-4.283l-51.289,12.608
|
||||||
|
c-3.321-2.935-6.699-5.833-10.114-8.673l1.849-54.914c0.197-5.559-2.394-10.842-6.845-13.925
|
||||||
|
c-4.445-3.104-10.093-3.573-14.955-1.266l-47.848,22.747c-3.854-2.21-7.728-4.4-11.644-6.517l-8.455-54.115
|
||||||
|
c-0.857-5.483-4.386-10.139-9.326-12.266c-4.923-2.137-10.568-1.447-14.891,1.808l-42.659,32.007
|
||||||
|
c-4.2-1.395-8.419-2.732-12.692-4.011l-18.386-51.316c-1.87-5.229-6.182-9.071-11.438-10.151c-5.238-1.072-10.63,0.742-14.263,4.802
|
||||||
|
l-35.907,40.171c-4.342-0.5-8.685-0.956-13.043-1.331l-27.723-46.713c-2.811-4.732-7.771-7.612-13.116-7.612
|
||||||
|
c-5.334,0-10.304,2.88-13.09,7.612l-27.733,46.713c-4.358,0.375-8.722,0.831-13.056,1.331l-35.91-40.171
|
||||||
|
c-3.636-4.06-9.047-5.874-14.268-4.802c-5.255,1.092-9.573,4.922-11.433,10.151l-18.402,51.316
|
||||||
|
c-4.26,1.279-8.481,2.627-12.691,4.011l-42.644-32.007c-4.336-3.266-9.98-3.955-14.916-1.808c-4.919,2.127-8.461,6.783-9.313,12.266
|
||||||
|
l-8.461,54.115c-3.914,2.117-7.789,4.294-11.653,6.517L436.1,168.34c-4.858-2.316-10.529-1.838-14.954,1.266
|
||||||
|
c-4.445,3.083-7.042,8.366-6.84,13.925l1.835,54.914c-3.405,2.84-6.774,5.738-10.112,8.673L354.75,234.51
|
||||||
|
c-5.211-1.265-10.67,0.351-14.441,4.283c-3.795,3.946-5.332,9.631-4.113,15.064l12.079,53.49c-2.802,3.467-5.575,6.971-8.293,10.521
|
||||||
|
l-52.655-1.913c-5.314-0.157-10.386,2.497-13.356,7.133c-2.974,4.613-3.425,10.521-1.211,15.608l21.814,49.903
|
||||||
|
c-2.119,4.008-4.224,8.048-6.249,12.15l-51.882,8.805c-5.271,0.888-9.715,4.566-11.765,9.71c-2.037,5.157-1.375,11.033,1.735,15.555
|
||||||
|
l30.69,44.451c-0.236,0.784-0.455,1.576-0.69,2.364l-16.863,17.911l45.341,64.05c0,0,435.152,200.731,838.797,3.396
|
||||||
|
C1169.796,558.719,1180.543,488.433,1180.543,488.433"/>
|
||||||
|
<path d="M795.716,446.557c0,0,48.162-52.734,96.324,0c0,0,37.844,70.318,0,105.473c0,0-61.922,49.223-96.324,0
|
||||||
|
C795.716,552.029,754.434,513.354,795.716,446.557"/>
|
||||||
|
<path fill="#FFFFFF" d="M855.154,481.097c0,19.782-11.66,35.82-26.041,35.82c-14.379,0-26.04-16.038-26.04-35.82
|
||||||
|
c0-19.782,11.661-35.821,26.04-35.821C843.494,445.275,855.154,461.315,855.154,481.097"/>
|
||||||
|
<path d="M578.401,430.129c0,0,84.436-37.385,107.481,46.059c0,0,24.141,97.261-69.339,102.751
|
||||||
|
C616.543,578.939,497.34,555.98,578.401,430.129"/>
|
||||||
|
<rect x="187.424" y="75.529" fill="none" width="1060" height="782"/>
|
||||||
|
<path fill="#FFFFFF" d="M627.514,481.096c0,20.579-12.13,37.27-27.095,37.27c-14.959,0-27.092-16.69-27.092-37.27
|
||||||
|
c0-20.583,12.133-37.27,27.092-37.27C615.384,443.826,627.514,460.513,627.514,481.096"/>
|
||||||
|
<path fill="#E33B26" d="M299.026,574.745c10.967-12.463,37.611-27.557,35.57-46.282c-3.653-33.526-31.456-57.999-62.099-54.658
|
||||||
|
c-7.599,0.827-14.658,3.292-20.923,7.035c-0.463-0.106-0.925-0.211-1.388-0.294c0,0-103.632,50.873-44.564,152.657
|
||||||
|
c0.557,5.137,117.847,155.668,150.787,167.131C377.968,807.836,336.498,671.694,299.026,574.745"/>
|
||||||
|
<path fill="#E33B26" d="M1140.973,570.202c-12.692-10.7-46.162-20.418-46.92-39.238c-1.355-33.697,22.512-62.021,53.312-63.26
|
||||||
|
c7.638-0.308,14.983,1.083,21.734,3.857c0.442-0.174,0.884-0.347,1.329-0.497c0,0,110.025,34.951,66.695,144.366
|
||||||
|
c0.21,5.163-93.468,171.416-124.345,187.635C1092.57,813.681,1118.285,671.635,1140.973,570.202"/>
|
||||||
|
<rect x="187.484" y="75.843" fill="none" width="1059.75" height="781.686"/>
|
||||||
|
<rect x="187.424" y="75.529" fill="none" width="1060" height="782"/>
|
||||||
|
<g>
|
||||||
|
<path fill="#E33B26" d="M283.144,565.511c0,0-137.214-4.942-161.62-140.761l57.596-25.427c0,0-13.912,96.957,106.615,110.022
|
||||||
|
L283.144,565.511"/>
|
||||||
|
<path fill="#E33B26" d="M127.552,333.083c0,0-24.965-49.774-65.807-113.261C18.721,241.035-2.671,299.05,13.482,357.484
|
||||||
|
c17.846,64.558,74.749,105.16,127.097,90.69s80.318-78.535,62.471-143.092c-7.909-28.618-23.501-52.519-42.963-69.011
|
||||||
|
C150.611,287.113,127.552,333.083,127.552,333.083"/>
|
||||||
|
</g>
|
||||||
|
<rect x="187.484" y="75.843" fill="none" width="1059.75" height="781.686"/>
|
||||||
|
<g>
|
||||||
|
<path fill="#E33B26" d="M1148.012,565.511c0,0,137.214-4.942,161.62-140.761l-57.596-25.428c0,0,13.912,96.957-106.615,110.022
|
||||||
|
L1148.012,565.511"/>
|
||||||
|
<path fill="#E33B26" d="M1303.604,333.083c0,0,24.966-49.774,65.808-113.261c43.023,21.212,64.416,79.228,48.262,137.662
|
||||||
|
c-17.846,64.558-74.748,105.16-127.096,90.689c-52.348-14.47-80.318-78.534-62.472-143.091
|
||||||
|
c7.909-28.618,23.501-52.519,42.964-69.011C1280.544,287.113,1303.604,333.083,1303.604,333.083"/>
|
||||||
|
</g>
|
||||||
|
<path d="M807.895,626.942c-7.131-58.735-72.193-61.431-72.193-61.431c-50.936,11.227-59.183,47.369-57.392,75.104L807.895,626.942z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 6.1 KiB |
72
images/ferris/question.svg
Normal file
72
images/ferris/question.svg
Normal file
|
|
@ -0,0 +1,72 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||||
|
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||||
|
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||||
|
width="1259px" height="847px" viewBox="0 0 1259 847" enable-background="new 0 0 1259 847" xml:space="preserve">
|
||||||
|
<!--<rect fill="#FFFFFF" width="1259" height="847"/>-->
|
||||||
|
<path fill="#8F1F1D" d="M706.403,338.05c-131.633,0-251.228,15.825-339.77,41.615v220.298
|
||||||
|
c88.542,25.79,208.137,41.614,339.77,41.614c150.657,0,285.535-20.729,376.134-53.402V391.457
|
||||||
|
C991.938,358.781,857.06,338.05,706.403,338.05"/>
|
||||||
|
<path fill="#8F1F1D" d="M1088.423,537.442c-3.856-10.663-4.629-24.154-1.36-37.162c5.85-23.289,22.421-36.198,37.013-28.833
|
||||||
|
c3.618,1.827,6.773,4.73,9.387,8.418c0.239-0.001,0.479,0,0.715,0.016c0,0,44.552,53.106,3.313,116.003
|
||||||
|
c-0.896,3.569-76.534,91.718-94.043,94.524C1031.987,692.244,1058.338,600.41,1088.423,537.442"/>
|
||||||
|
<path fill="#8F1F1D" d="M357.479,527.021c5.3-9.631,7.158-22.788,4.217-36.426c-5.266-24.416-23.91-41.109-41.642-37.285
|
||||||
|
c-4.398,0.948-8.325,3.072-11.666,6.099c-0.282-0.059-0.564-0.113-0.845-0.153c0,0-56.292,41.952-12.057,113.924
|
||||||
|
c0.805,3.741,83.851,108.838,104.311,115.764C413.188,693.475,388.55,596.418,357.479,527.021"/>
|
||||||
|
<path fill="#E23A26" d="M280.467,535.066l0.007,0.015C280.659,535.226,280.831,535.357,280.467,535.066"/>
|
||||||
|
<path fill="#E33B26" d="M1174.119,457.903c-0.88-3.064-1.756-6.126-2.662-9.162l30.683-44.451c3.13-4.522,3.771-10.398,1.73-15.555
|
||||||
|
c-2.04-5.13-6.49-8.81-11.76-9.71l-51.887-8.805c-2.008-4.102-4.115-8.142-6.229-12.15l21.797-49.903
|
||||||
|
c2.243-5.087,1.769-10.995-1.203-15.608c-2.961-4.636-7.99-7.344-13.349-7.133l-52.656,1.913c-2.727-3.55-5.496-7.068-8.322-10.521
|
||||||
|
l12.102-53.49c1.225-5.433-0.322-11.118-4.104-15.064c-3.762-3.932-9.229-5.559-14.426-4.283l-51.289,12.608
|
||||||
|
c-3.321-2.935-6.699-5.833-10.114-8.673l1.849-54.914c0.197-5.559-2.394-10.842-6.845-13.925
|
||||||
|
c-4.445-3.104-10.093-3.573-14.955-1.266l-47.848,22.747c-3.854-2.21-7.728-4.4-11.644-6.517l-8.455-54.115
|
||||||
|
c-0.857-5.483-4.386-10.139-9.326-12.266c-4.923-2.137-10.568-1.447-14.891,1.808l-42.659,32.007
|
||||||
|
c-4.2-1.395-8.419-2.732-12.692-4.011l-18.386-51.316c-1.87-5.229-6.182-9.071-11.438-10.151c-5.238-1.072-10.63,0.742-14.263,4.802
|
||||||
|
L764.97,100.97c-4.342-0.5-8.685-0.956-13.043-1.331l-27.723-46.713c-2.811-4.732-7.771-7.612-13.116-7.612
|
||||||
|
c-5.334,0-10.304,2.88-13.09,7.612l-27.733,46.713c-4.358,0.375-8.722,0.831-13.056,1.331l-35.91-40.171
|
||||||
|
c-3.636-4.06-9.047-5.874-14.268-4.802c-5.255,1.092-9.573,4.922-11.433,10.151l-18.402,51.316
|
||||||
|
c-4.26,1.279-8.481,2.627-12.691,4.011l-42.644-32.007c-4.336-3.266-9.98-3.955-14.916-1.808c-4.919,2.127-8.461,6.783-9.313,12.266
|
||||||
|
l-8.461,54.115c-3.914,2.117-7.789,4.294-11.653,6.517l-47.842-22.747c-4.858-2.316-10.529-1.838-14.954,1.266
|
||||||
|
c-4.445,3.083-7.042,8.366-6.84,13.925l1.835,54.914c-3.405,2.84-6.774,5.738-10.112,8.673l-51.279-12.608
|
||||||
|
c-5.211-1.265-10.67,0.351-14.441,4.283c-3.795,3.946-5.332,9.631-4.113,15.064l12.079,53.49c-2.802,3.467-5.575,6.971-8.293,10.521
|
||||||
|
l-52.655-1.913c-5.314-0.157-10.386,2.497-13.356,7.133c-2.974,4.613-3.425,10.521-1.211,15.608l21.814,49.903
|
||||||
|
c-2.119,4.008-4.224,8.048-6.249,12.15l-51.882,8.805c-5.271,0.888-9.715,4.566-11.765,9.71c-2.037,5.157-1.375,11.033,1.735,15.555
|
||||||
|
l30.69,44.451c-0.236,0.784-0.455,1.576-0.69,2.364l-16.863,17.911l45.341,64.05c0,0,435.152,200.731,838.797,3.396
|
||||||
|
C1163.372,528.189,1174.119,457.903,1174.119,457.903"/>
|
||||||
|
<path d="M788.629,436.277c0,0,54.108-46.602,95.626,11.5c0,0,29.173,74.328-12.593,104.708c0,0-67.353,41.473-95.627-11.5
|
||||||
|
C776.035,540.985,739.67,497.66,788.629,436.277"/>
|
||||||
|
<path fill="#FFFFFF" d="M843.648,464.356c-2.452,20.385-16.456,35.467-31.276,33.684c-14.817-1.781-24.846-19.755-22.395-40.14
|
||||||
|
c2.452-20.385,16.457-35.468,31.274-33.687C836.071,425.997,846.1,443.971,843.648,464.356"/>
|
||||||
|
<path d="M572.949,399.315c0,0,86.384-26.449,99.021,57.297c0,0,12.086,97.294-79.356,91.705
|
||||||
|
C592.613,548.317,479.508,512.09,572.949,399.315"/>
|
||||||
|
<rect x="181" y="45" fill="none" width="1060" height="782"/>
|
||||||
|
<path fill="#FFFFFF" d="M611.925,441.324c-2.528,21.021-16.969,36.581-32.257,34.742c-15.281-1.837-25.624-20.378-23.095-41.399
|
||||||
|
c2.529-21.026,16.973-36.581,32.253-34.743C604.113,401.763,614.454,420.298,611.925,441.324"/>
|
||||||
|
<path fill="#E33B26" d="M292.602,544.216c10.967-12.463,37.611-27.557,35.57-46.282c-3.653-33.526-31.456-57.999-62.099-54.658
|
||||||
|
c-7.599,0.827-14.658,3.292-20.923,7.035c-0.463-0.106-0.925-0.211-1.388-0.294c0,0-103.632,50.873-44.564,152.657
|
||||||
|
c0.557,5.137,117.847,155.668,150.787,167.131C371.544,777.307,330.074,641.165,292.602,544.216"/>
|
||||||
|
<path fill="#E33B26" d="M1134.549,539.673c-12.692-10.7-46.162-20.418-46.92-39.238c-1.355-33.697,22.512-62.021,53.312-63.26
|
||||||
|
c7.638-0.308,14.983,1.083,21.734,3.857c0.442-0.174,0.884-0.347,1.329-0.497c0,0,110.025,34.951,66.695,144.366
|
||||||
|
c0.21,5.163-93.468,171.416-124.345,187.635C1086.146,783.151,1111.861,641.105,1134.549,539.673"/>
|
||||||
|
<rect x="181.06" y="45.314" fill="none" width="1059.75" height="781.686"/>
|
||||||
|
<path fill="#E33B26" d="M372.142,545.559c0,0-1.383,137.296,133.166,167.933l28.054-56.363c0,0-97.495,9.431-104.995-111.569
|
||||||
|
H372.142"/>
|
||||||
|
<rect x="181" y="45" fill="none" width="1060" height="782"/>
|
||||||
|
<path fill="#E33B26" d="M1057.362,537.246c0,0,1.382,137.296-133.167,167.933l-28.055-56.363c0,0,97.495,9.431,104.995-111.569
|
||||||
|
H1057.362"/>
|
||||||
|
<path fill="#E33B26" d="M960.167,677.279c-20.25-48.941-85.595-68.373-145.951-43.399c-53.126,21.98-84.637,71.031-77.624,115.845
|
||||||
|
c41.946-0.652,86.94-3.371,130.736-9.718c0,0-25.837,41.763-63.857,78.211c25.566,6.599,55.383,4.768,84.076-7.104
|
||||||
|
C947.904,786.141,980.417,726.221,960.167,677.279"/>
|
||||||
|
<path fill="#E33B26" d="M585.746,745.985c0,0,55.203,7.295,130.67,9.155c6.61-47.511-29.38-97.792-86.801-117.242
|
||||||
|
c-63.438-21.488-128.989,2.792-146.414,54.231c-17.425,51.44,19.876,110.561,83.314,132.049
|
||||||
|
c28.121,9.526,56.653,10.049,81.229,3.207C610.833,790.881,585.746,745.985,585.746,745.985"/>
|
||||||
|
<rect x="181.06" y="45.314" fill="none" width="1059.75" height="781.686"/>
|
||||||
|
<g>
|
||||||
|
<path style="stroke:#ffffff;stroke-width:20" d="M92.314,318.146l0.072-12.563c-0.359-24.665,8.95-49.384,31.787-73.989c16.267-18.129,29.512-33.493,30.216-49.411
|
||||||
|
c0.747-16.883-9.835-28.95-33.932-30.499c-15.918-0.704-35.468,4.231-48.394,12.359l-14.075-53.303
|
||||||
|
c18.296-9.34,47.182-17.729,81.429-16.214c63.672,2.816,91.538,39.33,89.768,79.366c-1.621,36.659-25.84,59.753-45.066,79.202
|
||||||
|
c-18.24,19.009-26.789,37.48-27.267,59.207l-0.384,8.683L92.314,318.146z M76.808,384.64c1.152-26.048,19.789-43.105,44.872-41.997
|
||||||
|
c26.047,1.152,42.14,19.746,41.471,45.815c-1.109,25.083-18.824,43.148-45.353,41.975C92.232,429.303,75.698,409.723,76.808,384.64
|
||||||
|
z"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 6.6 KiB |
BIN
images/icons/icon.ico
Normal file
BIN
images/icons/icon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 264 KiB |
BIN
images/icons/icon.png
Normal file
BIN
images/icons/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 22 KiB |
BIN
images/icons/icon@2x.png
Normal file
BIN
images/icons/icon@2x.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 73 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.2 KiB |
|
|
@ -1,215 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
|
||||||
|
|
||||||
<svg
|
|
||||||
width="133.19101mm"
|
|
||||||
height="30.673956mm"
|
|
||||||
viewBox="0 0 133.19101 30.673956"
|
|
||||||
version="1.1"
|
|
||||||
id="svg5"
|
|
||||||
xml:space="preserve"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
xmlns:svg="http://www.w3.org/2000/svg"
|
|
||||||
xmlns:serif="http://www.serif.com/"><defs
|
|
||||||
id="defs2"><rect
|
|
||||||
x="77.397461"
|
|
||||||
y="286.99814"
|
|
||||||
width="586.12885"
|
|
||||||
height="183.24371"
|
|
||||||
id="rect738" /><filter
|
|
||||||
style="color-interpolation-filters:sRGB"
|
|
||||||
id="filter1484"
|
|
||||||
x="0"
|
|
||||||
y="0"
|
|
||||||
width="1.0182039"
|
|
||||||
height="1.0841649"><feFlood
|
|
||||||
flood-opacity="1"
|
|
||||||
flood-color="rgb(0,0,0)"
|
|
||||||
result="flood"
|
|
||||||
id="feFlood1474" /><feComposite
|
|
||||||
in="flood"
|
|
||||||
in2="SourceGraphic"
|
|
||||||
operator="in"
|
|
||||||
result="composite1"
|
|
||||||
id="feComposite1476" /><feGaussianBlur
|
|
||||||
in="composite1"
|
|
||||||
stdDeviation="0"
|
|
||||||
result="blur"
|
|
||||||
id="feGaussianBlur1478" /><feOffset
|
|
||||||
dx="9"
|
|
||||||
dy="9"
|
|
||||||
result="offset"
|
|
||||||
id="feOffset1480" /><feComposite
|
|
||||||
in="SourceGraphic"
|
|
||||||
in2="offset"
|
|
||||||
operator="over"
|
|
||||||
result="composite2"
|
|
||||||
id="feComposite1482" /></filter><linearGradient
|
|
||||||
id="_Linear1"
|
|
||||||
x1="0"
|
|
||||||
y1="0"
|
|
||||||
x2="1"
|
|
||||||
y2="0"
|
|
||||||
gradientUnits="userSpaceOnUse"
|
|
||||||
gradientTransform="matrix(1,0,0,-1,0,-6.50515e-4)"><stop
|
|
||||||
offset="0"
|
|
||||||
style="stop-color:rgb(247,76,0);stop-opacity:1"
|
|
||||||
id="stop1559" /><stop
|
|
||||||
offset="0.33"
|
|
||||||
style="stop-color:rgb(247,76,0);stop-opacity:1"
|
|
||||||
id="stop1561" /><stop
|
|
||||||
offset="1"
|
|
||||||
style="stop-color:rgb(244,150,0);stop-opacity:1"
|
|
||||||
id="stop1563" /></linearGradient><linearGradient
|
|
||||||
id="_Linear2"
|
|
||||||
x1="0"
|
|
||||||
y1="0"
|
|
||||||
x2="1"
|
|
||||||
y2="0"
|
|
||||||
gradientUnits="userSpaceOnUse"
|
|
||||||
gradientTransform="matrix(1,0,0,-1,0,1.23438e-6)"><stop
|
|
||||||
offset="0"
|
|
||||||
style="stop-color:rgb(204,58,0);stop-opacity:1"
|
|
||||||
id="stop1566" /><stop
|
|
||||||
offset="0.15"
|
|
||||||
style="stop-color:rgb(204,58,0);stop-opacity:1"
|
|
||||||
id="stop1568" /><stop
|
|
||||||
offset="0.74"
|
|
||||||
style="stop-color:rgb(247,76,0);stop-opacity:1"
|
|
||||||
id="stop1570" /><stop
|
|
||||||
offset="1"
|
|
||||||
style="stop-color:rgb(247,76,0);stop-opacity:1"
|
|
||||||
id="stop1572" /></linearGradient><linearGradient
|
|
||||||
id="_Linear3"
|
|
||||||
x1="0"
|
|
||||||
y1="0"
|
|
||||||
x2="1"
|
|
||||||
y2="0"
|
|
||||||
gradientUnits="userSpaceOnUse"
|
|
||||||
gradientTransform="scale(1,-1)"><stop
|
|
||||||
offset="0"
|
|
||||||
style="stop-color:rgb(204,58,0);stop-opacity:1"
|
|
||||||
id="stop1575" /><stop
|
|
||||||
offset="0.15"
|
|
||||||
style="stop-color:rgb(204,58,0);stop-opacity:1"
|
|
||||||
id="stop1577" /><stop
|
|
||||||
offset="0.74"
|
|
||||||
style="stop-color:rgb(247,76,0);stop-opacity:1"
|
|
||||||
id="stop1579" /><stop
|
|
||||||
offset="1"
|
|
||||||
style="stop-color:rgb(247,76,0);stop-opacity:1"
|
|
||||||
id="stop1581" /></linearGradient></defs><g
|
|
||||||
id="layer1"
|
|
||||||
transform="translate(-30.793165,-85.121777)"
|
|
||||||
style="display:inline"><text
|
|
||||||
xml:space="preserve"
|
|
||||||
transform="matrix(0.26458333,0,0,0.26458333,1.6365181,4.8830002)"
|
|
||||||
id="text736"
|
|
||||||
style="white-space:pre;shape-inside:url(#rect738);display:inline;fill:#ff7989;fill-opacity:1;filter:url(#filter1484)"><tspan
|
|
||||||
x="77.398438"
|
|
||||||
y="384.06447"
|
|
||||||
id="tspan3801"><tspan
|
|
||||||
style="font-weight:bold;font-size:133.333px;font-family:monospace;-inkscape-font-specification:'monospace Bold'"
|
|
||||||
id="tspan3799">[Gupax]</tspan></tspan></text><g
|
|
||||||
style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421"
|
|
||||||
id="g1629"
|
|
||||||
transform="matrix(0.00869483,0,0,0.00869483,91.862693,96.238413)"><g
|
|
||||||
id="Layer-1"
|
|
||||||
serif:id="Layer 1">
|
|
||||||
<g
|
|
||||||
transform="translate(597.344,637.02)"
|
|
||||||
id="g1512">
|
|
||||||
<path
|
|
||||||
d="m 0,-279.559 c -121.238,0 -231.39,14.576 -312.939,38.329 V -38.329 C -231.39,-14.575 -121.238,0 0,0 138.76,0 262.987,-19.092 346.431,-49.186 V -230.37 C 262.987,-260.465 138.76,-279.559 0,-279.559"
|
|
||||||
style="fill:#a52b00;fill-rule:nonzero"
|
|
||||||
id="path1510" />
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
transform="translate(1068.75,575.642)"
|
|
||||||
id="g1516">
|
|
||||||
<path
|
|
||||||
d="m 0,-53.32 -14.211,-29.441 c 0.073,-1.118 0.131,-2.237 0.131,-3.36 0,-33.375 -34.706,-64.135 -93.097,-88.762 V 2.643 c 27.245,-11.492 49.348,-24.317 65.156,-38.125 -4.652,18.707 -20.564,56.553 -33.25,83.168 -20.85,38.066 -28.4,71.203 -27.432,72.844 0.617,1.033 7.73,-9.94 18.219,-27.721 C -60.074,58.028 -13.82,-8.373 -4.575,-25.287 5.897,-44.461 0,-53.32 0,-53.32"
|
|
||||||
style="fill:#a52b00;fill-rule:nonzero"
|
|
||||||
id="path1514" />
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
transform="translate(149.064,591.421)"
|
|
||||||
id="g1520">
|
|
||||||
<path
|
|
||||||
d="m 0,-99.954 c 0,6.428 1.293,12.76 3.788,18.969 l -8.511,15.15 c 0,0 -6.818,8.846 5.188,27.508 10.59,16.455 63.635,80.867 91.632,114.598 12.026,17.293 20.179,27.945 20.893,26.916 1.124,-1.633 -7.476,-34.1 -31.359,-71.141 -11.144,-19.895 -24.454,-46.252 -32.442,-65.721 22.303,14.116 51.483,26.92 86.152,37.94 V -204.17 C 51.797,-177.622 0,-140.737 0,-99.954"
|
|
||||||
style="fill:#a52b00;fill-rule:nonzero"
|
|
||||||
id="path1518" />
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
transform="matrix(-65.8097,-752.207,-752.207,65.8097,621.707,796.312)"
|
|
||||||
id="g1524">
|
|
||||||
<path
|
|
||||||
d="M 0.991,-0.034 0.933,0.008 c 0,0.006 0,0.012 0,0.018 L 0.99,0.069 C 0.996,0.073 0.999,0.08 0.998,0.087 0.997,0.094 0.992,0.1 0.986,0.103 L 0.92,0.133 C 0.919,0.139 0.918,0.145 0.916,0.15 L 0.964,0.203 C 0.968,0.208 0.97,0.216 0.968,0.222 0.965,0.229 0.96,0.234 0.953,0.236 L 0.882,0.254 C 0.88,0.259 0.877,0.264 0.875,0.27 L 0.91,0.33 c 0.004,0.006 0.004,0.014 0,0.02 C 0.907,0.356 0.9,0.36 0.893,0.361 L 0.82,0.365 C 0.817,0.369 0.813,0.374 0.81,0.379 L 0.832,0.445 C 0.835,0.452 0.833,0.459 0.828,0.465 0.824,0.47 0.816,0.473 0.809,0.472 L 0.737,0.462 C 0.733,0.466 0.729,0.47 0.724,0.474 l 0.009,0.07 C 0.734,0.551 0.731,0.558 0.725,0.562 0.719,0.566 0.711,0.568 0.704,0.565 L 0.636,0.542 C 0.631,0.546 0.626,0.549 0.621,0.552 L 0.615,0.621 c 0,0.008 -0.005,0.014 -0.011,0.017 -0.007,0.003 -0.015,0.003 -0.021,0 L 0.521,0.602 C 0.52,0.603 0.519,0.603 0.518,0.603 L 0.406,0.729 c 0,0 -0.012,0.018 -0.047,-0.004 C 0.329,0.705 0.206,0.599 0.141,0.543 0.109,0.52 0.089,0.504 0.09,0.502 0.093,0.499 0.149,0.509 0.217,0.554 0.278,0.588 0.371,0.631 0.38,0.619 c 0,0 0.016,-0.015 0.026,-0.044 0,0 0,0 0,0 10e-4,0.001 10e-4,0.001 0,0 0,0 -0.315,-0.551 -0.101,-1.106 C 0.311,-0.593 0.275,-0.627 0.275,-0.627 0.266,-0.639 0.178,-0.598 0.12,-0.566 0.055,-0.523 0.002,-0.513 0,-0.516 -0.001,-0.518 0.018,-0.533 0.049,-0.555 0.11,-0.608 0.227,-0.707 0.256,-0.726 0.289,-0.748 0.301,-0.73 0.301,-0.73 l 0.101,0.115 c 0.004,0.001 0.008,0.002 0.013,0.002 L 0.47,-0.658 c 0.005,-0.005 0.013,-0.006 0.02,-0.004 0.007,0.002 0.012,0.007 0.014,0.014 l 0.018,0.068 c 0.005,0.002 0.011,0.004 0.016,0.006 l 0.064,-0.034 c 0.006,-0.004 0.014,-0.004 0.021,0 0.006,0.003 0.01,0.009 0.01,0.016 l 0.004,0.07 c 0.005,0.003 0.01,0.007 0.015,0.01 l 0.069,-0.022 c 0.007,-0.002 0.015,-0.001 0.02,0.003 0.006,0.005 0.009,0.012 0.008,0.019 l -0.011,0.069 c 0.004,0.004 0.008,0.008 0.013,0.012 l 0.072,-0.008 c 0.007,-0.001 0.014,0.002 0.019,0.007 0.005,0.006 0.006,0.013 0.003,0.02 l -0.024,0.065 c 0.003,0.005 0.007,0.01 0.01,0.015 l 0.072,0.005 c 0.008,0 0.014,0.005 0.017,0.011 0.004,0.006 0.004,0.014 0,0.02 l -0.037,0.06 c 0.002,0.005 0.004,0.01 0.006,0.016 l 0.07,0.018 c 0.007,0.002 0.013,0.007 0.015,0.014 0.002,0.007 0,0.014 -0.005,0.02 L 0.92,-0.116 c 0.001,0.005 0.003,0.011 0.004,0.017 l 0.064,0.031 C 0.995,-0.065 0.999,-0.059 1,-0.052 1.001,-0.045 0.997,-0.038 0.991,-0.034 Z M 0.406,0.575 c 0,0 0,0 0,0 0,0 0,0 0,0 z"
|
|
||||||
style="fill:url(#_Linear1);fill-rule:nonzero"
|
|
||||||
id="path1522" />
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
transform="translate(450.328,483.629)"
|
|
||||||
id="g1528">
|
|
||||||
<path
|
|
||||||
d="m 0,167.33 c -1.664,-1.42 -2.536,-2.262 -2.536,-2.262 L 140.006,153.391 C 23.733,0 -69.418,122.193 -79.333,135.855 v 31.475 z"
|
|
||||||
style="fill-rule:nonzero"
|
|
||||||
id="path1526" />
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
transform="translate(747.12,477.333)"
|
|
||||||
id="g1532">
|
|
||||||
<path
|
|
||||||
d="m 0,171.974 c 1.663,-1.42 2.536,-2.264 2.536,-2.264 L -134.448,159.687 C -18.12,0 69.421,126.835 79.335,140.497 v 31.477 z"
|
|
||||||
style="fill-rule:nonzero"
|
|
||||||
id="path1530" />
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
transform="matrix(-1.53e-5,-267.211,-267.211,1.53e-5,809.465,764.23)"
|
|
||||||
id="g1536">
|
|
||||||
<path
|
|
||||||
d="m 1,-0.586 c 0,0 -0.232,0.058 -0.476,0.421 L 0.5,-0.064 c 0,0 0.6,0.329 -0.076,0.795 0,0 0.084,-0.145 -0.019,-0.534 0,0 -0.274,0.179 -0.265,0.539 0,0 -0.415,-0.345 0.184,-0.871 0,0 0.215,-0.556 0.676,-0.601 z"
|
|
||||||
style="fill:url(#_Linear2);fill-rule:nonzero"
|
|
||||||
id="path1534" />
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
transform="translate(677.392,509.61)"
|
|
||||||
id="g1540">
|
|
||||||
<path
|
|
||||||
d="m 0,-92.063 c 0,0 43.486,-47.615 86.974,0 0,0 34.17,63.492 0,95.234 0,0 -55.912,44.444 -86.974,0 0,0 -37.275,-34.921 0,-95.234"
|
|
||||||
style="fill-rule:nonzero"
|
|
||||||
id="path1538" />
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
transform="translate(727.738,435.209)"
|
|
||||||
id="g1544">
|
|
||||||
<path
|
|
||||||
d="m 0,0.002 c 0,18.541 -10.93,33.572 -24.408,33.572 -13.477,0 -24.406,-15.031 -24.406,-33.572 0,-18.541 10.929,-33.574 24.406,-33.574 C -10.93,-33.572 0,-18.539 0,0.002"
|
|
||||||
style="fill:#ffffff;fill-rule:nonzero"
|
|
||||||
id="path1542" />
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
transform="translate(483.3,502.984)"
|
|
||||||
id="g1548">
|
|
||||||
<path
|
|
||||||
d="m 0,-98.439 c 0,0 74.596,-33.028 94.956,40.691 0,0 21.327,85.926 -61.259,90.776 0,0 -105.31,-20.283 -33.697,-131.467"
|
|
||||||
style="fill-rule:nonzero"
|
|
||||||
id="path1546" />
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
transform="translate(520.766,436.428)"
|
|
||||||
id="g1552">
|
|
||||||
<path
|
|
||||||
d="m 0,0 c 0,19.119 -11.27,34.627 -25.173,34.627 -13.898,0 -25.171,-15.508 -25.171,-34.627 0,-19.124 11.273,-34.627 25.171,-34.627 C -11.27,-34.627 0,-19.124 0,0"
|
|
||||||
style="fill:#ffffff;fill-rule:nonzero"
|
|
||||||
id="path1550" />
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
transform="matrix(-1.53e-5,-239.021,-239.021,1.53e-5,402.161,775.388)"
|
|
||||||
id="g1556">
|
|
||||||
<path
|
|
||||||
d="m 0.367,0.129 c -0.731,-0.57 -0.144,-0.84 -0.144,-0.84 0.036,0.32 0.249,0.547 0.249,0.547 0.049,-0.384 0.053,-0.606 0.053,-0.606 0.678,0.514 0.064,0.931 0.064,0.931 0.038,0.104 0.183,0.211 0.317,0.29 L 1,0.77 C 0.376,0.403 0.367,0.129 0.367,0.129 Z"
|
|
||||||
style="fill:url(#_Linear3);fill-rule:nonzero"
|
|
||||||
id="path1554" />
|
|
||||||
</g>
|
|
||||||
</g></g></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 10 KiB |
|
|
@ -1,96 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
|
||||||
|
|
||||||
<svg
|
|
||||||
width="150pt"
|
|
||||||
height="150pt"
|
|
||||||
viewBox="0 0 52.916668 52.916668"
|
|
||||||
version="1.1"
|
|
||||||
id="svg5"
|
|
||||||
sodipodi:docname="icon.svg"
|
|
||||||
xml:space="preserve"
|
|
||||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14, custom)"
|
|
||||||
inkscape:export-filename="png/icon.png"
|
|
||||||
inkscape:export-xdpi="123.08"
|
|
||||||
inkscape:export-ydpi="123.08"
|
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
|
|
||||||
id="namedview7"
|
|
||||||
pagecolor="#505050"
|
|
||||||
bordercolor="#ffffff"
|
|
||||||
borderopacity="1"
|
|
||||||
inkscape:showpageshadow="0"
|
|
||||||
inkscape:pageopacity="0"
|
|
||||||
inkscape:pagecheckerboard="1"
|
|
||||||
inkscape:deskcolor="#505050"
|
|
||||||
inkscape:document-units="mm"
|
|
||||||
showgrid="false"
|
|
||||||
inkscape:zoom="6.1350077"
|
|
||||||
inkscape:cx="108.80182"
|
|
||||||
inkscape:cy="128.0357"
|
|
||||||
inkscape:window-width="3840"
|
|
||||||
inkscape:window-height="2075"
|
|
||||||
inkscape:window-x="3840"
|
|
||||||
inkscape:window-y="48"
|
|
||||||
inkscape:window-maximized="1"
|
|
||||||
inkscape:current-layer="layer1" /><defs
|
|
||||||
id="defs2"><rect
|
|
||||||
x="77.397461"
|
|
||||||
y="286.99814"
|
|
||||||
width="586.12885"
|
|
||||||
height="183.24371"
|
|
||||||
id="rect738" /><filter
|
|
||||||
style="color-interpolation-filters:sRGB"
|
|
||||||
inkscape:label="Drop Shadow"
|
|
||||||
id="filter1484"
|
|
||||||
x="0"
|
|
||||||
y="0"
|
|
||||||
width="1.0516056"
|
|
||||||
height="1.0903617"><feFlood
|
|
||||||
flood-opacity="1"
|
|
||||||
flood-color="rgb(0,0,0)"
|
|
||||||
result="flood"
|
|
||||||
id="feFlood1474" /><feComposite
|
|
||||||
in="flood"
|
|
||||||
in2="SourceGraphic"
|
|
||||||
operator="in"
|
|
||||||
result="composite1"
|
|
||||||
id="feComposite1476" /><feGaussianBlur
|
|
||||||
in="composite1"
|
|
||||||
stdDeviation="0"
|
|
||||||
result="blur"
|
|
||||||
id="feGaussianBlur1478" /><feOffset
|
|
||||||
dx="9"
|
|
||||||
dy="9"
|
|
||||||
result="offset"
|
|
||||||
id="feOffset1480" /><feComposite
|
|
||||||
in="SourceGraphic"
|
|
||||||
in2="offset"
|
|
||||||
operator="over"
|
|
||||||
result="composite2"
|
|
||||||
id="feComposite1482" /></filter></defs><g
|
|
||||||
inkscape:label="Layer 1"
|
|
||||||
inkscape:groupmode="layer"
|
|
||||||
id="layer1"
|
|
||||||
transform="translate(-29.156647,-80.238777)"><text
|
|
||||||
xml:space="preserve"
|
|
||||||
transform="matrix(0.26458333,0,0,0.26458333,2.5612654,12.85359)"
|
|
||||||
id="text736"
|
|
||||||
style="white-space:pre;shape-inside:url(#rect738);fill:#ff7989;fill-opacity:1;filter:url(#filter1484)"><tspan
|
|
||||||
x="77.398438"
|
|
||||||
y="384.06447"
|
|
||||||
id="tspan385"><tspan
|
|
||||||
style="font-weight:bold;font-size:133.333px;font-family:monospace;-inkscape-font-specification:'monospace Bold'"
|
|
||||||
id="tspan383">[G]</tspan></tspan></text><text
|
|
||||||
xml:space="preserve"
|
|
||||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:35.2777px;font-family:monospace;-inkscape-font-specification:'monospace Bold';fill:#ff7989;fill-opacity:1;stroke-width:0.264583"
|
|
||||||
x="57.074924"
|
|
||||||
y="109.1902"
|
|
||||||
id="text1848"><tspan
|
|
||||||
sodipodi:role="line"
|
|
||||||
id="tspan1846"
|
|
||||||
style="stroke-width:0.264583"
|
|
||||||
x="57.074924"
|
|
||||||
y="109.1902"> </tspan></text></g></svg>
|
|
||||||
|
Before Width: | Height: | Size: 3.3 KiB |
|
|
@ -16,12 +16,16 @@
|
||||||
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
pub const GUPAX_VERSION: &'static str = concat!("v", env!("CARGO_PKG_VERSION"));
|
pub const GUPAX_VERSION: &'static str = concat!("v", env!("CARGO_PKG_VERSION"));
|
||||||
pub const P2POOL_VERSION: &'static str = "v2.3";
|
pub const P2POOL_VERSION: &'static str = "v2.4";
|
||||||
pub const XMRIG_VERSION: &'static str = "v6.18.0";
|
pub const XMRIG_VERSION: &'static str = "v6.18.0";
|
||||||
pub const COMMIT: &'static str = include_str!("../.git/refs/heads/main");
|
pub const COMMIT: &'static str = include_str!("../.git/refs/heads/main");
|
||||||
|
|
||||||
pub const BYTES_ICON: &[u8] = include_bytes!("../images/png/icon.png");
|
// Use macOS shaped icon for macOS
|
||||||
pub const BYTES_BANNER: &[u8] = include_bytes!("../images/png/banner.png");
|
#[cfg(target_os = "macos")]
|
||||||
|
pub const BYTES_ICON: &[u8] = include_bytes!("../images/icons/icon@2x.png");
|
||||||
|
#[cfg(not(target_os = "macos"))]
|
||||||
|
pub const BYTES_ICON: &[u8] = include_bytes!("../images/icons/icon.png");
|
||||||
|
pub const BYTES_BANNER: &[u8] = include_bytes!("../images/banner.png");
|
||||||
pub const P2POOL_BASE_ARGS: &'static str = "";
|
pub const P2POOL_BASE_ARGS: &'static str = "";
|
||||||
pub const XMRIG_BASE_ARGS: &'static str = "--http-host=127.0.0.1 --http-port=18088 --algo=rx/0 --coin=Monero --randomx-cache-qos";
|
pub const XMRIG_BASE_ARGS: &'static str = "--http-host=127.0.0.1 --http-port=18088 --algo=rx/0 --coin=Monero --randomx-cache-qos";
|
||||||
pub const HORIZONTAL: &'static str = "--------------------------------------------";
|
pub const HORIZONTAL: &'static str = "--------------------------------------------";
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,8 @@
|
||||||
// You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
//#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
|
// Hide console in Windows
|
||||||
|
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------- Imports
|
//---------------------------------------------------------------------------------------------------- Imports
|
||||||
// egui/eframe
|
// egui/eframe
|
||||||
|
|
|
||||||
|
|
@ -24,31 +24,30 @@
|
||||||
// b. auto-update at startup
|
// b. auto-update at startup
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------- Imports
|
//---------------------------------------------------------------------------------------------------- Imports
|
||||||
use serde_derive::{Serialize,Deserialize};
|
|
||||||
use tokio::task::JoinHandle;
|
|
||||||
use std::time::Duration;
|
|
||||||
use std::sync::{Arc,Mutex};
|
|
||||||
use std::io::{Read,Write};
|
|
||||||
//use crate::{Name::*,State};
|
|
||||||
use rand::{thread_rng, Rng};
|
|
||||||
use rand::distributions::Alphanumeric;
|
|
||||||
use anyhow::{anyhow,Error};
|
use anyhow::{anyhow,Error};
|
||||||
use arti_hyper::*;
|
|
||||||
use arti_client::{TorClient,TorClientConfig};
|
use arti_client::{TorClient,TorClientConfig};
|
||||||
use tokio::io::{AsyncReadExt,AsyncWriteExt};
|
|
||||||
use tls_api::{TlsConnector, TlsConnectorBuilder};
|
|
||||||
use hyper::header::HeaderValue;
|
|
||||||
use hyper::{Client,Body,Request};
|
|
||||||
use hyper_tls::HttpsConnector;
|
|
||||||
use arti_hyper::*;
|
use arti_hyper::*;
|
||||||
use log::*;
|
use arti_hyper::*;
|
||||||
use crate::update::Name::*;
|
|
||||||
use std::path::PathBuf;
|
|
||||||
use crate::state::*;
|
|
||||||
use crate::constants::GUPAX_VERSION;
|
use crate::constants::GUPAX_VERSION;
|
||||||
|
//use crate::{Name::*,State};
|
||||||
|
use crate::state::*;
|
||||||
|
use crate::update::Name::*;
|
||||||
|
use hyper::{Client,Body,Request};
|
||||||
|
use hyper::header::HeaderValue;
|
||||||
|
use hyper_tls::HttpsConnector;
|
||||||
|
use log::*;
|
||||||
|
use rand::distributions::Alphanumeric;
|
||||||
|
use rand::{thread_rng, Rng};
|
||||||
|
use serde_derive::{Serialize,Deserialize};
|
||||||
|
use std::io::{Read,Write};
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use std::sync::{Arc,Mutex};
|
||||||
|
use std::time::Duration;
|
||||||
|
use tls_api::{TlsConnector, TlsConnectorBuilder};
|
||||||
|
use tokio::io::{AsyncReadExt,AsyncWriteExt};
|
||||||
|
use tokio::task::JoinHandle;
|
||||||
use walkdir::WalkDir;
|
use walkdir::WalkDir;
|
||||||
|
use zip::ZipArchive;
|
||||||
// use tls_api_native_tls::{TlsConnector,TlsConnectorBuilder};
|
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------- Constants
|
//---------------------------------------------------------------------------------------------------- Constants
|
||||||
// Package naming schemes:
|
// Package naming schemes:
|
||||||
|
|
@ -531,6 +530,8 @@ impl Update {
|
||||||
std::fs::OpenOptions::new().create(true).write(true).mode(0o770).open(&tmp)?;
|
std::fs::OpenOptions::new().create(true).write(true).mode(0o770).open(&tmp)?;
|
||||||
std::fs::write(tmp, pkg.bytes.lock().unwrap().as_ref())?;
|
std::fs::write(tmp, pkg.bytes.lock().unwrap().as_ref())?;
|
||||||
} else {
|
} else {
|
||||||
|
#[cfg(target_os = "windows")]
|
||||||
|
ZipArchive::extract(&mut ZipArchive::new(std::io::Cursor::new(pkg.bytes.lock().unwrap().as_ref()))?, tmp)?;
|
||||||
#[cfg(target_family = "unix")]
|
#[cfg(target_family = "unix")]
|
||||||
tar::Archive::new(flate2::read::GzDecoder::new(pkg.bytes.lock().unwrap().as_ref())).unpack(tmp)?;
|
tar::Archive::new(flate2::read::GzDecoder::new(pkg.bytes.lock().unwrap().as_ref())).unpack(tmp)?;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue