From 522f42c283d35a096685a1e75de3f1a0f827ec63 Mon Sep 17 00:00:00 2001
From: JappeHallunken <jappe@posteo.de>
Date: Sun, 21 Jan 2024 20:54:42 +0100
Subject: [PATCH] dietpi-troubleshoot isn't needed anymore, so I deleted it.

---
 dietpi/func/dietpi-globals      | 9 +++++----
 dietpi/func/dietpi-troubleshoot | 8 --------
 2 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 dietpi/func/dietpi-troubleshoot

diff --git a/dietpi/func/dietpi-globals b/dietpi/func/dietpi-globals
index 5871907a68..88797de975 100644
--- a/dietpi/func/dietpi-globals
+++ b/dietpi/func/dietpi-globals
@@ -804,14 +804,15 @@ $grey─────────────────────────
 		return "${result:-1}"
 	}
 
-	G_BUG_REPORT() {echo -e "\e[41m
+	G_BUG_REPORT() {
+		dietpi_version="v$G_DIETPI_VERSION_CORE.$G_DIETPI_VERSION_SUB.$G_DIETPI_VERSION_RC ($G_GITOWNER/$G_GITBRANCH)"
+		echo -e "\e[41m
 #### Details:
 - Date           | $(date)
 - DietPi version | $dietpi_version
-
 - Hardware       | $G_HW_MODEL_NAME (ID=$G_HW_MODEL)
 - Kernel version | \`$(uname -a)\`
-- Distro         | $G_DISTRO_NAME (ID=$G_DISTRO${G_RASPBIAN:+,RASPBIAN=$G_RASPBIAN})"
+- Distro         | $G_DISTRO_NAME (ID=$G_DISTRO${G_RASPBIAN:+,RASPBIAN=$G_RASPBIAN})\e[0m"
 }
 
 	#-----------------------------------------------------------------------------------
@@ -901,7 +902,7 @@ $grey─────────────────────────
 - Please create a ticket: https://github.com/MichaIng/DietPi/issues -
 - Copy and paste only the BLUE lines below into the ticket          -
 ---------------------------------------------------------------------\e[44m"
-G_BUG_REPORT "$dietpi_version"
+G_BUG_REPORT
 echo -e "\e[41m- Image creator  | $image_creator
 - Pre-image      | $preimage_name
 - Command        | \`$ecommand\`
diff --git a/dietpi/func/dietpi-troubleshoot b/dietpi/func/dietpi-troubleshoot
deleted file mode 100644
index e276dba13a..0000000000
--- a/dietpi/func/dietpi-troubleshoot
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-. /boot/dietpi/func/dietpi-globals
-G_INIT
-cat /boot/dietpi/.version
-echo $G_DISTRO_NAME $G_RASPBIAN
-uname -a
-dpkg --print-architecture
-echo $G_HW_MODEL_NAME