From 59d38e0bc4ee181c150ff6933d77c520cc3d5dc3 Mon Sep 17 00:00:00 2001
From: illegitimate-egg <cameron@humaneyestudio.co.uk>
Date: Tue, 15 Jul 2025 23:06:36 +0100
Subject: [PATCH] Fix stream issues

---
 README.md      |  6 ++++-
 info-dumper.sh | 63 ++++++++------------------------------------------
 main.sh        | 58 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 55 deletions(-)
 create mode 100755 main.sh

diff --git a/README.md b/README.md
index 20b6d7c..ae46828 100644
--- a/README.md
+++ b/README.md
@@ -9,5 +9,9 @@ The script is also available as a redirect from https://dukesyndicate.org/info-d
 | Transfer method | Command                                                           |
 |-----------------|-------------------------------------------------------------------|
 | curl            | `curl -sSL https://dukesyndicate.org/info-dumper.sh \| sudo bash` |
-| wget            | `wget -qO- https://dukesyndicate.org/info-dumper.sh \| sudo bash` |
+
+Deprecated transfer methods:
+| Transfer method | Command                                                           | Deprecation reason          |
+|-----------------|-------------------------------------------------------------------|-----------------------------|
+| wget            | `wget -qO- https://dukesyndicate.org/info-dumper.sh \| sudo bash` | Program now depends on curl |
 
diff --git a/info-dumper.sh b/info-dumper.sh
index 1268455..044bfe1 100755
--- a/info-dumper.sh
+++ b/info-dumper.sh
@@ -1,58 +1,13 @@
 #!/bin/bash
 
-if [[ $EUID -ne 0 ]]; then
-  printf "This script must be run as root"
-  exit 1
-fi
+###
+# This is the Raspberry Pi Community info dumper entry point. The additional file is necessary as another pipe is needed for user input,
+# it is easier to have bash use a file pipe than it is to use named pipes. This will also help for future expansion. - illegitimate-egg (2025-07-15)
+###
 
-printf "version info:\n" >/tmp/rpc-dump.txt
-{
-  # pi model/device
-  uname -a
-  printf "\n"
-  cat /proc/version
+# Acquire script
+curl -sSL https://raw.githubusercontent.com/K9T33NwthTookThis/RPC-info-dumper/refs/heads/main/main.sh > /tmp/rpc-info-dumper.sh
+chmod +x /tmp/rpc-info-dumper.sh
 
-  printf "\n\n journalctl:\n"
-  journalctl -n 50 --no-pager
-
-  printf "\n\n dmesg:\n"
-  dmesg -H | tail -50
-
-  printf "\n\n storage:\n"
-  df -h
-
-  printf "\n\n cpu info:\n"
-  lscpu
-
-  printf "\n\n pci:\n"
-  lspci
-
-  printf "\n\n uptime:\n"
-  uptime
-} >>/tmp/rpc-dump.txt
-
-# Remove non system user names on system
-getent passwd | while IFS=: read -r name _ uid _ _ _ _; do
-  # System accounts shouldn't be redacted, as well as some user accounts
-  if ((uid < 1000)); then
-    continue
-  fi
-
-  awk -v user="$name" '{gsub(user, "[REDACTED]"); print}' /tmp/rpc-dump.txt | tee /tmp/rpc-dump-stripped.txt &>/dev/null
-done
-
-read -rp "Print output? [y, N]: " -t 8 output
-if [[ $output == y ]]; then
-  cat /tmp/rpc-dump-stripped.txt
-fi
-
-rm /tmp/rpc-dump.txt
-
-printf "                                                          
-                                                          __ 
- _____ _____ _____ ____     _____ _____ __    _____ _ _ _|  |
-| __  |   __|  _  |    \   | __  |   __|  |  |     | | | |  |
-|    -|   __|     |  |  |  | __ -|   __|  |__|  |  | | | |__|
-|__|__|_____|__|__|____/   |_____|_____|_____|_____|_____|__|\n"
-printf "\nSend this link to the person who asked you to run this:\n"
-curl -F'file=@/tmp/rpc-dump-stripped.txt' -A "raspberry-pi-community info reporter, <cameron@humaneyestudio.co.uk>" https://0x0.st
+# Launch that thing
+sudo bash /tmp/rpc-info-dumper.sh
diff --git a/main.sh b/main.sh
new file mode 100755
index 0000000..1268455
--- /dev/null
+++ b/main.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+if [[ $EUID -ne 0 ]]; then
+  printf "This script must be run as root"
+  exit 1
+fi
+
+printf "version info:\n" >/tmp/rpc-dump.txt
+{
+  # pi model/device
+  uname -a
+  printf "\n"
+  cat /proc/version
+
+  printf "\n\n journalctl:\n"
+  journalctl -n 50 --no-pager
+
+  printf "\n\n dmesg:\n"
+  dmesg -H | tail -50
+
+  printf "\n\n storage:\n"
+  df -h
+
+  printf "\n\n cpu info:\n"
+  lscpu
+
+  printf "\n\n pci:\n"
+  lspci
+
+  printf "\n\n uptime:\n"
+  uptime
+} >>/tmp/rpc-dump.txt
+
+# Remove non system user names on system
+getent passwd | while IFS=: read -r name _ uid _ _ _ _; do
+  # System accounts shouldn't be redacted, as well as some user accounts
+  if ((uid < 1000)); then
+    continue
+  fi
+
+  awk -v user="$name" '{gsub(user, "[REDACTED]"); print}' /tmp/rpc-dump.txt | tee /tmp/rpc-dump-stripped.txt &>/dev/null
+done
+
+read -rp "Print output? [y, N]: " -t 8 output
+if [[ $output == y ]]; then
+  cat /tmp/rpc-dump-stripped.txt
+fi
+
+rm /tmp/rpc-dump.txt
+
+printf "                                                          
+                                                          __ 
+ _____ _____ _____ ____     _____ _____ __    _____ _ _ _|  |
+| __  |   __|  _  |    \   | __  |   __|  |  |     | | | |  |
+|    -|   __|     |  |  |  | __ -|   __|  |__|  |  | | | |__|
+|__|__|_____|__|__|____/   |_____|_____|_____|_____|_____|__|\n"
+printf "\nSend this link to the person who asked you to run this:\n"
+curl -F'file=@/tmp/rpc-dump-stripped.txt' -A "raspberry-pi-community info reporter, <cameron@humaneyestudio.co.uk>" https://0x0.st