diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfab51c..b3de995 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# v0.1.2
+Fix release for beta version.
+This version is only made for testing purposes and have feedbacks.
+
+## Changes
+
+## Fixes
+Persist current shares value
+fix script for release
+
+## Bundled Versions
+* [`P2Pool v3.10`](https://github.com/SChernykh/p2pool/releases/tag/v3.10)
+* [`XMRig v6.21.2`](https://github.com/xmrig/xmrig/releases/tag/v6.21.2)
+
+
# v0.1.1
Fix release for beta version.
This version is only made for testing purposes and have feedbacks.
diff --git a/Cargo.lock b/Cargo.lock
index b0c0776..398a4e3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2064,7 +2064,7 @@ dependencies = [
[[package]]
name = "gupaxx"
-version = "0.1.0"
+version = "0.1.2"
dependencies = [
"anyhow",
"benri",
diff --git a/Cargo.toml b/Cargo.toml
index 2d5ff51..e6ee4b0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
cargo-features = ["profile-rustflags"]
[package]
name = "gupaxx"
-version = "0.1.1"
+version = "0.1.2"
authors = ["cyrix126 <gupaxx@baermail.fr>"]
description = "Fork of Gupax integrating the XMRvsBeast Raffle "
documentation = "https://github.com/cyrix126/gupaxx"
diff --git a/src/helper/p2pool.rs b/src/helper/p2pool.rs
index 2d8eb67..cd557c3 100644
--- a/src/helper/p2pool.rs
+++ b/src/helper/p2pool.rs
@@ -36,7 +36,7 @@ impl Helper {
output_pub: Arc<Mutex<String>>,
reader: Box<dyn std::io::Read + Send>,
gupax_p2pool_api: Arc<Mutex<GupaxP2poolApi>>,
- pub_api: Arc<Mutex<PubP2poolApi>>,
+ gui_api: Arc<Mutex<PubP2poolApi>>,
) {
use std::io::BufRead;
let mut stdout = std::io::BufReader::new(reader).lines();
@@ -74,7 +74,7 @@ impl Helper {
"P2pool | PTY getting current shares data from status: {} share",
shares
);
- lock!(pub_api).sidechain_shares = shares;
+ lock!(gui_api).sidechain_shares = shares;
} else {
error!("P2pool | PTY Getting data from status: Lines contains Your shares but no value found: {}", line);
}
@@ -425,7 +425,7 @@ impl Helper {
let output_parse = Arc::clone(&lock!(process).output_parse);
let output_pub = Arc::clone(&lock!(process).output_pub);
let gupax_p2pool_api = Arc::clone(&gupax_p2pool_api);
- let p2pool_api_c = Arc::clone(&pub_api);
+ let p2pool_api_c = Arc::clone(&gui_api);
thread::spawn(move || {
Self::read_pty_p2pool(
output_parse,
@@ -879,6 +879,7 @@ impl PubP2poolApi {
output,
tick: std::mem::take(&mut gui_api.tick),
tick_status: std::mem::take(&mut gui_api.tick_status),
+ sidechain_shares: std::mem::take(&mut gui_api.sidechain_shares),
..pub_api.clone()
};
}
diff --git a/utils/package.sh b/utils/package.sh
index a780f89..fcdd4d7 100755
--- a/utils/package.sh
+++ b/utils/package.sh
@@ -48,9 +48,6 @@ title "Windows folder check"
[[ -f windows/P2Pool/p2pool.exe ]]; check "windows/P2Pool/p2pool.exe"
[[ -f windows/XMRig/xmrig.exe ]]; check "windows/XMRig/xmrig.exe"
-# Get random date for tar/zip
-title "RNG Date"
-DATE=$(date -d @${RNG}); check "DATE ... $DATE"
# Tar Linux Bundle
title "Tar Linux"
@@ -59,12 +56,12 @@ chmod +x linux/gupaxx
chmod +x linux/p2pool/p2pool
chmod +x linux/xmrig/xmrig
mv linux "gupaxx-$NEW_VER-linux-x64-bundle"; check "linux -> gupaxx-$NEW_VER-linux-x64-bundle"
-tar -czpf "gupaxx-${NEW_VER}-linux-x64-bundle.tar.gz" "gupaxx-$NEW_VER-linux-x64-bundle" --owner=lm --group=lm --mtime="$DATE"; check "tar linux-bundle"
+tar -czpf "gupaxx-${NEW_VER}-linux-x64-bundle.tar.gz" "gupaxx-$NEW_VER-linux-x64-bundle" --owner=lm --group=lm ; check "tar linux-bundle"
# Tar Linux Standalone
mv "gupaxx-$NEW_VER-linux-x64-bundle" "gupaxx-$NEW_VER-linux-x64-standalone"; check "gupaxx-$NEW_VER-linux-x64-bundle -> gupaxx-$NEW_VER-linux-x64-standalone"
rm -r "gupaxx-$NEW_VER-linux-x64-standalone/p2pool"; check "rm gupaxx-$NEW_VER-linux-x64-standalone/p2pool"
rm -r "gupaxx-$NEW_VER-linux-x64-standalone/xmrig"; check "rm gupaxx-$NEW_VER-linux-x64-standalone/xmrig"
-tar -czpf "gupaxx-${NEW_VER}-linux-x64-standalone.tar.gz" "gupaxx-$NEW_VER-linux-x64-standalone" --owner=lm --group=lm --mtime="$DATE"; check "tar linux-standalone"
+tar -czpf "gupaxx-${NEW_VER}-linux-x64-standalone.tar.gz" "gupaxx-$NEW_VER-linux-x64-standalone" --owner=lm --group=lm ; check "tar linux-standalone"
# Remove dir
rm -r "gupaxx-$NEW_VER-linux-x64-standalone"; check "rm linux dir"
@@ -72,12 +69,12 @@ rm -r "gupaxx-$NEW_VER-linux-x64-standalone"; check "rm linux dir"
# Tar macOS Bundle
title "Tar macOS-x64"
mv macos-x64 "gupaxx-$NEW_VER-macos-x64-bundle"; check "macos-x64 -> gupaxx-$NEW_VER-macos-x64-bundle"
-tar -czpf "gupaxx-${NEW_VER}-macos-x64-bundle.tar.gz" "gupaxx-$NEW_VER-macos-x64-bundle" --owner=lm --group=lm --mtime="$DATE"; check "tar macos-bundle"
+tar -czpf "gupaxx-${NEW_VER}-macos-x64-bundle.tar.gz" "gupaxx-$NEW_VER-macos-x64-bundle" --owner=lm --group=lm ; check "tar macos-bundle"
# Tar macOS Standalone
mv "gupaxx-$NEW_VER-macos-x64-bundle" "gupaxx-$NEW_VER-macos-x64-standalone"; check "gupaxx-$NEW_VER-macos-x64-bundle -> gupaxx-$NEW_VER-macos-x64-standalone"
rm -r "gupaxx-$NEW_VER-macos-x64-standalone/Gupaxx.app/Contents/MacOS/p2pool"; check "rm gupaxx-$NEW_VER-macos-x64-standalone/Gupaxx.app/Contents/MacOS/p2pool"
rm -r "gupaxx-$NEW_VER-macos-x64-standalone/Gupaxx.app/Contents/MacOS/xmrig"; check "rm gupaxx-$NEW_VER-macos-x64-standalone/Gupaxx.app/Contents/MacOS/xmrig/xmrig"
-tar -czpf "gupaxx-${NEW_VER}-macos-x64-standalone.tar.gz" "gupaxx-$NEW_VER-macos-x64-standalone" --owner=lm --group=lm --mtime="$DATE"; check "tar macos-x64-standalone"
+tar -czpf "gupaxx-${NEW_VER}-macos-x64-standalone.tar.gz" "gupaxx-$NEW_VER-macos-x64-standalone" --owner=lm --group=lm ; check "tar macos-x64-standalone"
# Remove dir
rm -r "gupaxx-$NEW_VER-macos-x64-standalone"; check "rm macos-x64 dir"
@@ -85,12 +82,12 @@ rm -r "gupaxx-$NEW_VER-macos-x64-standalone"; check "rm macos-x64 dir"
# Tar macOS Bundle
title "Tar macOS-arm64"
mv macos-arm64 "gupaxx-$NEW_VER-macos-arm64-bundle"; check "macos-arm64 -> gupaxx-$NEW_VER-macos-arm64-bundle"
-tar -czpf "gupaxx-${NEW_VER}-macos-arm64-bundle.tar.gz" "gupaxx-$NEW_VER-macos-arm64-bundle" --owner=lm --group=lm --mtime="$DATE"; check "tar macos-arm64-bundle"
+tar -czpf "gupaxx-${NEW_VER}-macos-arm64-bundle.tar.gz" "gupaxx-$NEW_VER-macos-arm64-bundle" --owner=lm --group=lm ; check "tar macos-arm64-bundle"
# Tar macOS Standalone
mv "gupaxx-$NEW_VER-macos-arm64-bundle" "gupaxx-$NEW_VER-macos-arm64-standalone"; check "gupaxx-$NEW_VER-macos-arm64-bundle -> gupaxx-$NEW_VER-macos-arm64-standalone"
rm -r "gupaxx-$NEW_VER-macos-arm64-standalone/Gupaxx.app/Contents/MacOS/p2pool"; check "rm gupaxx-$NEW_VER-macos-arm64-standalone/Gupaxx.app/Contents/MacOS/p2pool"
rm -r "gupaxx-$NEW_VER-macos-arm64-standalone/Gupaxx.app/Contents/MacOS/xmrig"; check "rm gupaxx-$NEW_VER-macos-arm64-standalone/Gupaxx.app/Contents/MacOS/xmrig/xmrig"
-tar -czpf "gupaxx-${NEW_VER}-macos-arm64-standalone.tar.gz" "gupaxx-$NEW_VER-macos-arm64-standalone" --owner=lm --group=lm --mtime="$DATE"; check "tar macos-arm64-standalone"
+tar -czpf "gupaxx-${NEW_VER}-macos-arm64-standalone.tar.gz" "gupaxx-$NEW_VER-macos-arm64-standalone" --owner=lm --group=lm ; check "tar macos-arm64-standalone"
# Remove dir
rm -r "gupaxx-$NEW_VER-macos-arm64-standalone"; check "rm macos dir"
diff --git a/utils/skel/linux/Gupaxx.AppImage b/utils/skel/linux/Gupaxx.AppImage
index 753d3a4..8e2e874 100755
--- a/utils/skel/linux/Gupaxx.AppImage
+++ b/utils/skel/linux/Gupaxx.AppImage
@@ -1 +1 @@
-./gupax
+./gupaxx
diff --git a/utils/skel/macos-arm64/Gupax.app/Contents/Info.plist b/utils/skel/macos-arm64/Gupaxx.app/Contents/Info.plist
similarity index 100%
rename from utils/skel/macos-arm64/Gupax.app/Contents/Info.plist
rename to utils/skel/macos-arm64/Gupaxx.app/Contents/Info.plist
diff --git a/utils/skel/macos-arm64/macos-x64/Gupaxx.app/Contents/MacOS/gupaxx b/utils/skel/macos-arm64/Gupaxx.app/Contents/MacOS/gupaxx
similarity index 100%
rename from utils/skel/macos-arm64/macos-x64/Gupaxx.app/Contents/MacOS/gupaxx
rename to utils/skel/macos-arm64/Gupaxx.app/Contents/MacOS/gupaxx
diff --git a/utils/skel/macos-arm64/Gupax.app/Contents/MacOS/p2pool/p2pool b/utils/skel/macos-arm64/Gupaxx.app/Contents/MacOS/p2pool/p2pool
similarity index 100%
rename from utils/skel/macos-arm64/Gupax.app/Contents/MacOS/p2pool/p2pool
rename to utils/skel/macos-arm64/Gupaxx.app/Contents/MacOS/p2pool/p2pool
diff --git a/utils/skel/macos-arm64/Gupax.app/Contents/MacOS/xmrig/xmrig b/utils/skel/macos-arm64/Gupaxx.app/Contents/MacOS/xmrig/xmrig
similarity index 100%
rename from utils/skel/macos-arm64/Gupax.app/Contents/MacOS/xmrig/xmrig
rename to utils/skel/macos-arm64/Gupaxx.app/Contents/MacOS/xmrig/xmrig
diff --git a/utils/skel/macos-arm64/macos-x64/Gupaxx.app/Contents/Resources/Gupaxx.icns b/utils/skel/macos-arm64/Gupaxx.app/Contents/Resources/Gupaxx.icns
similarity index 100%
rename from utils/skel/macos-arm64/macos-x64/Gupaxx.app/Contents/Resources/Gupaxx.icns
rename to utils/skel/macos-arm64/Gupaxx.app/Contents/Resources/Gupaxx.icns
diff --git a/utils/skel/macos-arm64/macos-x64/Gupaxx.app/Contents/Info.plist b/utils/skel/macos-x64/Gupaxx.app/Contents/Info.plist
similarity index 100%
rename from utils/skel/macos-arm64/macos-x64/Gupaxx.app/Contents/Info.plist
rename to utils/skel/macos-x64/Gupaxx.app/Contents/Info.plist
diff --git a/utils/skel/macos-arm64/Gupax.app/Contents/MacOS/gupax b/utils/skel/macos-x64/Gupaxx.app/Contents/MacOS/gupaxx
similarity index 100%
rename from utils/skel/macos-arm64/Gupax.app/Contents/MacOS/gupax
rename to utils/skel/macos-x64/Gupaxx.app/Contents/MacOS/gupaxx
diff --git a/utils/skel/macos-arm64/macos-x64/Gupaxx.app/Contents/MacOS/p2pool/p2pool b/utils/skel/macos-x64/Gupaxx.app/Contents/MacOS/p2pool/p2pool
similarity index 100%
rename from utils/skel/macos-arm64/macos-x64/Gupaxx.app/Contents/MacOS/p2pool/p2pool
rename to utils/skel/macos-x64/Gupaxx.app/Contents/MacOS/p2pool/p2pool
diff --git a/utils/skel/macos-arm64/macos-x64/Gupaxx.app/Contents/MacOS/xmrig/xmrig b/utils/skel/macos-x64/Gupaxx.app/Contents/MacOS/xmrig/xmrig
similarity index 100%
rename from utils/skel/macos-arm64/macos-x64/Gupaxx.app/Contents/MacOS/xmrig/xmrig
rename to utils/skel/macos-x64/Gupaxx.app/Contents/MacOS/xmrig/xmrig
diff --git a/utils/skel/macos-arm64/Gupax.app/Contents/Resources/Gupax.icns b/utils/skel/macos-x64/Gupaxx.app/Contents/Resources/Gupaxx.icns
similarity index 100%
rename from utils/skel/macos-arm64/Gupax.app/Contents/Resources/Gupax.icns
rename to utils/skel/macos-x64/Gupaxx.app/Contents/Resources/Gupaxx.icns