mirror of
https://github.com/Cyrix126/gupaxx.git
synced 2024-11-16 15:27:46 +00:00
v1.2.3
This commit is contained in:
hinto.janai
parent
483a94f203
commit
9efe1e0d1a
17 changed files with 42 additions and 18 deletions
12
CHANGELOG.md
12
CHANGELOG.md
|
|
@ -1,13 +1,17 @@
|
|||
# v1.2.3
|
||||
## Updates
|
||||
*
|
||||
* Added ARM (Apple Silicon) macOS releases (bundle includes ARM P2Pool/XMRig)
|
||||
* [Remote Node](https://github.com/hinto-janai/gupax#remote-monero-nodes) changes:
|
||||
- Added `xmr.support`
|
||||
- Added `xmr.theuplink.net`
|
||||
|
||||
## Fixes
|
||||
*
|
||||
* Fixed macOS Tor+TLS issue, updates are now via Tor by default ([#28](https://github.com/hinto-janai/gupax/issues/28))
|
||||
* Fixed undisplayable ANSI codes in P2Pool's terminal ([#24](https://github.com/hinto-janai/gupax/issues/34))
|
||||
|
||||
## Bundled Versions
|
||||
* [`P2Pool v3.3`](https://github.com/SChernykh/p2pool/releases/tag/v3.3)
|
||||
* [`XMRig v6.19.2`](https://github.com/xmrig/xmrig/releases/tag/v6.19.2)
|
||||
* [`P2Pool v3.4`](https://github.com/SChernykh/p2pool/releases/tag/v3.4)
|
||||
* [`XMRig v6.19.3`](https://github.com/xmrig/xmrig/releases/tag/v6.19.3)
|
||||
|
||||
|
||||
---
|
||||
|
|
|
|||
|
|
@ -581,11 +581,13 @@ These are the remote nodes used by Gupax in the `[P2Pool Simple]` tab. They are
|
|||
| xmr.foxpro.su | 🇳🇱 NL - North Holland | 18081 | 18084 |
|
||||
| home.allantaylor.kiwi | 🇳🇿 NZ - Canterbury | 18089 | 18083 |
|
||||
| ru.poiuty.com | 🇷🇺 RU - Kuzbass | 18081 | 18084 |
|
||||
| xmr.support | 🇺🇸 US - California | 18081 | 18083 |
|
||||
| radishfields.hopto.org | 🇺🇸 US - Colorado | 18081 | 18084 |
|
||||
| xmrbandwagon.hopto.org | 🇺🇸 US - Colorado | 18081 | 18084 |
|
||||
| xmr.spotlightsound.com | 🇺🇸 US - Kansas | 18081 | 18084 |
|
||||
| xmrnode.facspro.net | 🇺🇸 US - Nebraska | 18089 | 18084 |
|
||||
| node.sethforprivacy.com | 🇺🇸 US - New York | 18089 | 18083 |
|
||||
| xmr.theuplink.net | 🇺🇸 US - New York | 18081 | 18084 |
|
||||
| moneronode.ddns.net | 🇺🇸 US - Pennsylvania | 18089 | 18084 |
|
||||
| node.richfowler.net | 🇺🇸 US - Pennsylvania | 18089 | 18084 |
|
||||
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ Windows versions of Gupax also need the file to end with `.exe`.
|
|||
|
||||
The actual `zip/tar` matching is static, however. They have to be packaged exactly with the following naming scheme. If an exact match is not found, it will error:
|
||||
- `gupax-vX.X.X-(windows|macos|linux)-(x64|arm64)-(standalone|bundle).(zip|tar.gz)`
|
||||
- `p2pool-vX.X.X-(windows|macos|linux)-(x64|arm64).(zip|tar.gz)`
|
||||
- `p2pool-vX.X.X-(windows|macos|linux)-(x64|aarch64).(zip|tar.gz)`
|
||||
- `xmrig-X.X.X-(msvc-win64|macos-x64|macos-arm64|linux-static-x64).(zip|tar.gz)`
|
||||
|
||||
Exceptions (there are always exceptions...):
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@
|
|||
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
pub const GUPAX_VERSION: &str = concat!("v", env!("CARGO_PKG_VERSION")); // e.g: v1.0.0
|
||||
pub const P2POOL_VERSION: &str = "v3.3";
|
||||
pub const XMRIG_VERSION: &str = "v6.19.2";
|
||||
pub const P2POOL_VERSION: &str = "v3.4";
|
||||
pub const XMRIG_VERSION: &str = "v6.19.3";
|
||||
pub const COMMIT: &str = include_str!("../.git/refs/heads/main");
|
||||
// e.g: Gupax_v1_0_0
|
||||
// Would have been [Gupax_v1.0.0] but P2Pool truncates everything after [.]
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ use hyper::{
|
|||
// Remote Monero Nodes with ZMQ enabled, sourced from: [https://github.com/hinto-janai/monero-nodes]
|
||||
// The format is an array of tuples consisting of: (IP, LOCATION, RPC_PORT, ZMQ_PORT)
|
||||
|
||||
pub const REMOTE_NODES: [(&str, &str, &str, &str); 24] = [
|
||||
pub const REMOTE_NODES: [(&str, &str, &str, &str); 26] = [
|
||||
("monero.10z.com.ar", "AR - Buenos Aires F.D.", "18089", "18084"),
|
||||
("monero2.10z.com.ar", "BR - São Paulo", "18089", "18083"),
|
||||
("monero1.heitechsoft.com", "CA - Ontario", "18081", "18084"),
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ use zip::ZipArchive;
|
|||
//---------------------------------------------------------------------------------------------------- Constants
|
||||
// Package naming schemes:
|
||||
// gupax | gupax-vX.X.X-(windows|macos|linux)-(x64|arm64)-(standalone|bundle).(zip|tar.gz)
|
||||
// p2pool | p2pool-vX.X.X-(windows|macos|linux)-(x64|arm64).(zip|tar.gz)
|
||||
// p2pool | p2pool-vX.X.X-(windows|macos|linux)-(x64|aarch64).(zip|tar.gz)
|
||||
// xmrig | xmrig-X.X.X-(msvc-win64|macos-x64|macos-arm64|linux-static-x64).(zip|tar.gz)
|
||||
//
|
||||
// Download link = PREFIX + Version (found at runtime) + SUFFIX + Version + EXT
|
||||
|
|
@ -152,7 +152,7 @@ mod impl_platform {
|
|||
pub(super) use super::impl_unix::*;
|
||||
|
||||
pub(super) const GUPAX_EXTENSION: &str = "-macos-arm64-standalone.tar.gz";
|
||||
pub(super) const P2POOL_EXTENSION: &str = "-macos-arm64.tar.gz";
|
||||
pub(super) const P2POOL_EXTENSION: &str = "-macos-aarch64.tar.gz";
|
||||
pub(super) const XMRIG_EXTENSION: &str = "-macos-arm64.tar.gz";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -45,10 +45,14 @@ OUTPUT=$(cat linux/Gupax.AppImage)
|
|||
[[ $OUTPUT = "./gupax" ]]; check "linux/Gupax.AppImage = ./gupax"
|
||||
[[ -f linux/p2pool/p2pool ]]; check "linux/p2pool/p2pool"
|
||||
[[ -f linux/xmrig/xmrig ]]; check "linux/xmrig/xmrig"
|
||||
title "macOS folder check"
|
||||
[[ -d macos/Gupax.app ]]; check "macos/Gupax.app"
|
||||
[[ -f macos/Gupax.app/Contents/MacOS/p2pool/p2pool ]]; check "macos/p2pool/p2pool"
|
||||
[[ -f macos/Gupax.app/Contents/MacOS/xmrig/xmrig ]]; check "macos/xmrig/xmrig"
|
||||
title "macOS-x64 folder check"
|
||||
[[ -d macos-x64/Gupax.app ]]; check "macos-x64/Gupax.app"
|
||||
[[ -f macos-x64/Gupax.app/Contents/MacOS/p2pool/p2pool ]]; check "macos-x64/p2pool/p2pool"
|
||||
[[ -f macos-x64/Gupax.app/Contents/MacOS/xmrig/xmrig ]]; check "macos-x64/xmrig/xmrig"
|
||||
title "macOS-arm64 folder check"
|
||||
[[ -d macos-arm64/Gupax.app ]]; check "macos-arm64/Gupax.app"
|
||||
[[ -f macos-arm64/Gupax.app/Contents/MacOS/p2pool/p2pool ]]; check "macos-arm64/p2pool/p2pool"
|
||||
[[ -f macos-arm64/Gupax.app/Contents/MacOS/xmrig/xmrig ]]; check "macos-arm64/xmrig/xmrig"
|
||||
title "Windows folder check"
|
||||
[[ -f windows/Gupax.exe ]]; check "windows/Gupax.exe"
|
||||
[[ -f windows/P2Pool/p2pool.exe ]]; check "windows/P2Pool/p2pool.exe"
|
||||
|
|
@ -74,17 +78,31 @@ tar -czpf "gupax-${NEW_VER}-linux-x64-standalone.tar.gz" "gupax-$NEW_VER-linux-x
|
|||
# Remove dir
|
||||
rm -r "gupax-$NEW_VER-linux-x64-standalone"; check "rm linux dir"
|
||||
|
||||
# x64
|
||||
# Tar macOS Bundle
|
||||
title "Tar macOS"
|
||||
mv macos "gupax-$NEW_VER-macos-x64-bundle"; check "macos -> gupax-$NEW_VER-macos-x64-bundle"
|
||||
title "Tar macOS-x64"
|
||||
mv macos-x64 "gupax-$NEW_VER-macos-x64-bundle"; check "macos-x64 -> gupax-$NEW_VER-macos-x64-bundle"
|
||||
tar -czpf "gupax-${NEW_VER}-macos-x64-bundle.tar.gz" "gupax-$NEW_VER-macos-x64-bundle" --owner=hinto --group=hinto --mtime="$DATE"; check "tar macos-bundle"
|
||||
# Tar macOS Standalone
|
||||
mv "gupax-$NEW_VER-macos-x64-bundle" "gupax-$NEW_VER-macos-x64-standalone"; check "gupax-$NEW_VER-macos-x64-bundle -> gupax-$NEW_VER-macos-x64-standalone"
|
||||
rm -r "gupax-$NEW_VER-macos-x64-standalone/Gupax.app/Contents/MacOS/p2pool"; check "rm gupax-$NEW_VER-macos-x64-standalone/Gupax.app/Contents/MacOS/p2pool"
|
||||
rm -r "gupax-$NEW_VER-macos-x64-standalone/Gupax.app/Contents/MacOS/xmrig"; check "rm gupax-$NEW_VER-macos-x64-standalone/Gupax.app/Contents/MacOS/xmrig/xmrig"
|
||||
tar -czpf "gupax-${NEW_VER}-macos-x64-standalone.tar.gz" "gupax-$NEW_VER-macos-x64-standalone" --owner=hinto --group=hinto --mtime="$DATE"; check "tar macos-standalone"
|
||||
tar -czpf "gupax-${NEW_VER}-macos-x64-standalone.tar.gz" "gupax-$NEW_VER-macos-x64-standalone" --owner=hinto --group=hinto --mtime="$DATE"; check "tar macos-x64-standalone"
|
||||
# Remove dir
|
||||
rm -r "gupax-$NEW_VER-macos-x64-standalone"; check "rm macos dir"
|
||||
rm -r "gupax-$NEW_VER-macos-x64-standalone"; check "rm macos-x64 dir"
|
||||
|
||||
# ARM
|
||||
# Tar macOS Bundle
|
||||
title "Tar macOS-arm64"
|
||||
mv macos-arm64 "gupax-$NEW_VER-macos-arm64-bundle"; check "macos-arm64 -> gupax-$NEW_VER-macos-arm64-bundle"
|
||||
tar -czpf "gupax-${NEW_VER}-macos-arm64-bundle.tar.gz" "gupax-$NEW_VER-macos-arm64-bundle" --owner=hinto --group=hinto --mtime="$DATE"; check "tar macos-arm64-bundle"
|
||||
# Tar macOS Standalone
|
||||
mv "gupax-$NEW_VER-macos-arm64-bundle" "gupax-$NEW_VER-macos-arm64-standalone"; check "gupax-$NEW_VER-macos-arm64-bundle -> gupax-$NEW_VER-macos-arm64-standalone"
|
||||
rm -r "gupax-$NEW_VER-macos-arm64-standalone/Gupax.app/Contents/MacOS/p2pool"; check "rm gupax-$NEW_VER-macos-arm64-standalone/Gupax.app/Contents/MacOS/p2pool"
|
||||
rm -r "gupax-$NEW_VER-macos-arm64-standalone/Gupax.app/Contents/MacOS/xmrig"; check "rm gupax-$NEW_VER-macos-arm64-standalone/Gupax.app/Contents/MacOS/xmrig/xmrig"
|
||||
tar -czpf "gupax-${NEW_VER}-macos-arm64-standalone.tar.gz" "gupax-$NEW_VER-macos-arm64-standalone" --owner=hinto --group=hinto --mtime="$DATE"; check "tar macos-arm64-standalone"
|
||||
# Remove dir
|
||||
rm -r "gupax-$NEW_VER-macos-arm64-standalone"; check "rm macos dir"
|
||||
|
||||
# Zip Windows Bundle
|
||||
title "Zip Windows"
|
||||
|
|
|
|||
0
utils/skel/macos-x64/Gupax.app/Contents/Info.plist
Executable file
0
utils/skel/macos-x64/Gupax.app/Contents/Info.plist
Executable file
0
utils/skel/macos-x64/Gupax.app/Contents/MacOS/gupax
Normal file
0
utils/skel/macos-x64/Gupax.app/Contents/MacOS/gupax
Normal file
0
utils/skel/macos-x64/Gupax.app/Contents/Resources/Gupax.icns
Executable file
0
utils/skel/macos-x64/Gupax.app/Contents/Resources/Gupax.icns
Executable file
Loading…
Reference in a new issue