From c4311acdecca099fc16f4382676ba8fa1d2e516a Mon Sep 17 00:00:00 2001
From: hinto-janaiyo <hinto.janaiyo@protonmail.com>
Date: Mon, 14 Nov 2022 22:11:00 -0500
Subject: [PATCH] main: more strict [gupax_update_] deletion with regex

---
 src/main.rs   | 19 +++++++++++++------
 src/update.rs |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 7fcfdfd..e84110f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -82,7 +82,7 @@ pub struct App {
 	p2pool: bool, // Is p2pool online?
 	xmrig: bool, // Is xmrig online?
 	// State from [--flags]
-	startup: bool,
+	no_startup: bool,
 	reset: bool,
 	// Static stuff
 	now: Instant, // Internal timer
@@ -121,7 +121,7 @@ impl App {
 			diff: false,
 			p2pool: false,
 			xmrig: false,
-			startup: true,
+			no_startup: false,
 			reset: false,
 			now: Instant::now(),
 			exe: "".to_string(),
@@ -289,7 +289,12 @@ fn init_options() -> NativeOptions {
 }
 
 fn init_auto(app: &App) {
-	info!("Starting init_auto()...");
+	if app.no_startup {
+		info!("[--no-startup] flag passed, skipping init_auto()...");
+		return
+	} else {
+		info!("Starting init_auto()...");
+	}
 	// [Auto-Update]
 	if app.state.gupax.auto_update {
 		let path_p2pool = app.og.lock().unwrap().gupax.absolute_p2pool_path.display().to_string();
@@ -364,7 +369,7 @@ fn parse_args(mut app: App) -> App {
 		match arg.as_str() {
 			"-l"|"--node-list"  => { info!("Printing node list..."); print_disk_file(File::Node); }
 			"-s"|"--state"      => { info!("Printing state..."); print_disk_file(File::State); }
-			"-n"|"--no-startup" => { info!("Disabling startup..."); app.startup = false; }
+			"-n"|"--no-startup" => { info!("Disabling startup..."); app.no_startup = true; }
 			"-r"|"--reset"      => { info!("Resetting state..."); app.reset = true; }
 			_                   => { eprintln!("[Gupax error] Invalid option: [{}]\nFor help, use: [--help]", arg); exit(1); },
 		}
@@ -388,12 +393,14 @@ pub fn get_exe_dir() -> Result<String, std::io::Error> {
 	}
 }
 
-// Clean any [gupax_tmp.*] directories
+// Clean any [gupax_update_.*] directories
+// The trailing random bits must be exactly 10 alphanumeric characters
 pub fn clean_dir() -> Result<(), anyhow::Error> {
+	let regex = Regex::new("^gupax_update_[A-Za-z0-9]{10}$").unwrap();
 	for entry in std::fs::read_dir(get_exe_dir()?)? {
 		let entry = entry?;
 		if ! entry.path().is_dir() { continue }
-		if entry.file_name().to_str().ok_or(anyhow::Error::msg("Basename failed"))?.starts_with("gupax_update_") {
+		if Regex::is_match(&regex, entry.file_name().to_str().ok_or(anyhow::Error::msg("Basename failed"))?) {
 			let path = entry.path();
 			match std::fs::remove_dir_all(&path) {
 				Ok(_) => info!("Remove [{}] ... OK", path.display()),
diff --git a/src/update.rs b/src/update.rs
index ca30856..6901c16 100644
--- a/src/update.rs
+++ b/src/update.rs
@@ -245,7 +245,7 @@ impl Update {
 	// Get a temporary random folder for package download contents
 	// This used to use [std::env::temp_dir()] but there were issues
 	// using [std::fs::rename()] on tmpfs -> disk (Invalid cross-device link (os error 18)).
-	// So, uses the [Gupax] binary directory as a base, something like [/home/hinto/gupax/gupax_tmp_SG4xsDdVmr]
+	// So, uses the [Gupax] binary directory as a base, something like [/home/hinto/gupax/gupax_update_SG4xsDdVmr]
 	pub fn get_tmp_dir() -> Result<String, anyhow::Error> {
 		let rand_string: String = thread_rng()
 			.sample_iter(&Alphanumeric)