From f935b242800170ef958a1e699dbe9005d6d7d9ac Mon Sep 17 00:00:00 2001
From: cyber-idiot <136726700+cyber-idiot@users.noreply.github.com>
Date: Thu, 15 Jun 2023 20:07:43 +0200
Subject: [PATCH 1/9] Update setup.sh

---
 setup.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/setup.sh b/setup.sh
index 0d8407c..bc266d9 100644
--- a/setup.sh
+++ b/setup.sh
@@ -15,7 +15,8 @@ echo "Installing required tools" ; sleep 1
 sudo apt-get install libsndfile1-dev zenity -y
 clear
 echo "Changing directory --> src" ; sleep 1
-cd /home/pi/PiFM/src
+username=$(whoami)
+cd /home/$username/PiFM/src
 clear
 echo "Cleaning up" ; sleep 1
 make clean
@@ -27,26 +28,26 @@ echo "Making adjustments to --> /boot/config.txt" ; sleep 1
 echo "gpu_freq=250" | sudo tee -a /boot/config.txt > /dev/null
 clear
 echo "Adding software" ; sleep 1
-cd /home/pi/PiFM
+cd /home/$username/PiFM
 # Copy GUI Version
-sudo cp /home/pi/PiFM/pifm.sh /usr/local/bin
+sudo cp /home/$username/PiFM/pifm.sh /usr/local/bin
 sudo mv /usr/local/bin/pifm.sh /usr/local/bin/pifm
 # Copy Basic Version
-sudo cp /home/pi/PiFM/pifm-basic.sh /usr/local/bin
+sudo cp /home/$username/PiFM/pifm-basic.sh /usr/local/bin
 sudo mv /usr/local/bin/pifm-basic.sh /usr/local/bin/pifm-basic
 clear
 echo "Creating shortcuts" ; sleep 1
-sudo cp /home/pi/PiFM/src/PiFM.desktop /home/pi/Desktop
-sudo cp /home/pi/PiFM/src/PiFM.desktop /usr/share/applications
+sudo cp /home/$username/PiFM/src/PiFM.desktop /home/$username/Desktop
+sudo cp /home/$username/PiFM/src/PiFM.desktop /usr/share/applications
 echo "Changing filename/type" ; sleep 1
-sudo mv /home/pi/PiFM/src/pi_fm_adv /home/pi/PiFM/src/pifm
+sudo mv /home/$username/PiFM/src/pi_fm_adv /home/$username/PiFM/src/pifm
 clear
 echo "Patching xterm" ; sleep 1
 cd /usr/bin
 sudo cp lxterminal xterm
 clear
 echo "Assigning permissions" ; sleep 1
-sudo chmod +x /home/pi/PiFM/pifm
+sudo chmod +x /home/$username/PiFM/pifm
 sudo chmod +x /usr/local/bin/pifm
 sudo chmod +x /usr/local/bin/pifm-basic
 clear

From a02547a121c5e6837221e7888cac4ef0a8ead6aa Mon Sep 17 00:00:00 2001
From: cyber-idiot <136726700+cyber-idiot@users.noreply.github.com>
Date: Thu, 15 Jun 2023 20:09:36 +0200
Subject: [PATCH 2/9] Update setup-pi4.sh

---
 setup-pi4.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/setup-pi4.sh b/setup-pi4.sh
index d777c93..79e2f29 100644
--- a/setup-pi4.sh
+++ b/setup-pi4.sh
@@ -15,7 +15,8 @@ echo "Installing required tools" ; sleep 1
 sudo apt-get install libsndfile1-dev zenity git -y
 clear
 echo "Changing directory --> src" ; sleep 1
-cd /home/pi/PiFM/src
+username=$(whoami)
+cd /home/$username/PiFM/src
 clear
 echo "Cleaning up" ; sleep 1
 make clean
@@ -29,26 +30,26 @@ echo "Editing -> /boot/config.txt" ; sleep 1
 echo "gpu_freq=250" | sudo tee -a /boot/config.txt > /dev/null
 clear
 echo "Adding software" ; sleep 1
-cd /home/pi/PiFM
+cd /home/$username/PiFM
 # Copy GUI Version
-sudo cp /home/pi/PiFM/src/pi4/pifm.sh /usr/local/bin
+sudo cp /home/$username/PiFM/src/pi4/pifm.sh /usr/local/bin
 sudo mv /usr/local/bin/pifm.sh /usr/local/bin/pifm
 # Copy Basic Version
-sudo cp /home/pi/PiFM/src/pi4/pifm-basic.sh /usr/local/bin
+sudo cp /home/$username/PiFM/src/pi4/pifm-basic.sh /usr/local/bin
 sudo mv /usr/local/bin/pifm-basic.sh /usr/local/bin/pifm-basic
 clear
 echo "Creating shortcuts" ; sleep 1
-sudo cp /home/pi/PiFM/src/pi4/PiFM.desktop /home/pi/Desktop
-sudo cp /home/pi/PiFM/src/pi4/PiFM.desktop /usr/share/applications
+sudo cp /home/$username/PiFM/src/pi4/PiFM.desktop /home/$username/Desktop
+sudo cp /home/$username/PiFM/src/pi4/PiFM.desktop /usr/share/applications
 echo "Changing filename/type" ; sleep 0.1
-sudo mv /home/pi/PiFM/src/pi_fm_adv /home/pi/PiFM/src/pifm
+sudo mv /home/$username/PiFM/src/pi_fm_adv /home/$username/PiFM/src/pifm
 clear
 echo "Patching xterm" ; sleep 0.1
 cd /usr/bin
 sudo cp lxterminal xterm
 clear
 echo "Assigning permissions" ; sleep 0.1
-sudo chmod +x /home/pi/PiFM/pifm
+sudo chmod +x /home/$username/PiFM/pifm
 sudo chmod +x /usr/local/bin/pifm
 sudo chmod +x /usr/local/bin/pifm-basic
 clear

From f6dc9c878ba84de8347187b7d9f1742a1901469d Mon Sep 17 00:00:00 2001
From: cyber-idiot <136726700+cyber-idiot@users.noreply.github.com>
Date: Fri, 16 Jun 2023 11:27:54 +0200
Subject: [PATCH 3/9] Update setup.sh

---
 setup.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup.sh b/setup.sh
index bc266d9..8768a98 100644
--- a/setup.sh
+++ b/setup.sh
@@ -51,6 +51,9 @@ sudo chmod +x /home/$username/PiFM/pifm
 sudo chmod +x /usr/local/bin/pifm
 sudo chmod +x /usr/local/bin/pifm-basic
 clear
+if [ $username != "pi" ]; then
+  sed -i "s|/pi/|/$username/|" /home/$username/Desktop/PiFM.desktop
+fi
 echo "Completed" ; sleep 2
 clear
 echo "To start broadcasting, use the menu or desktop shortcuts,"

From 68dfa07936ffd2b284c212d48884772c1a3655f2 Mon Sep 17 00:00:00 2001
From: cyber-idiot <136726700+cyber-idiot@users.noreply.github.com>
Date: Fri, 16 Jun 2023 11:29:05 +0200
Subject: [PATCH 4/9] Update setup-pi4.sh

---
 setup-pi4.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup-pi4.sh b/setup-pi4.sh
index 79e2f29..2f1110e 100644
--- a/setup-pi4.sh
+++ b/setup-pi4.sh
@@ -55,6 +55,9 @@ sudo chmod +x /usr/local/bin/pifm-basic
 clear
 echo "Completed" ; sleep 2
 clear
+if [ $username != "pi" ]; then
+  sed -i "s|/pi/|/$username/|" /home/$username/Desktop/PiFM.desktop
+fi
 echo "To start broadcasting, use the start menu/desktop shortcuts,"
 echo "or type radio into the terminal. Preparing reboot..."
 sleep 5

From dfe36df4318464fb6e8d1b07a667ec5314fe4a85 Mon Sep 17 00:00:00 2001
From: cyber-idiot <136726700+cyber-idiot@users.noreply.github.com>
Date: Fri, 16 Jun 2023 11:29:40 +0200
Subject: [PATCH 5/9] Update setup-pi4.sh

---
 setup-pi4.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup-pi4.sh b/setup-pi4.sh
index 2f1110e..3c2457a 100644
--- a/setup-pi4.sh
+++ b/setup-pi4.sh
@@ -53,11 +53,11 @@ sudo chmod +x /home/$username/PiFM/pifm
 sudo chmod +x /usr/local/bin/pifm
 sudo chmod +x /usr/local/bin/pifm-basic
 clear
-echo "Completed" ; sleep 2
-clear
 if [ $username != "pi" ]; then
   sed -i "s|/pi/|/$username/|" /home/$username/Desktop/PiFM.desktop
 fi
+echo "Completed" ; sleep 2
+clear
 echo "To start broadcasting, use the start menu/desktop shortcuts,"
 echo "or type radio into the terminal. Preparing reboot..."
 sleep 5

From 176315711793969ec94446a3ca011c709171db05 Mon Sep 17 00:00:00 2001
From: cyber-idiot <136726700+cyber-idiot@users.noreply.github.com>
Date: Fri, 16 Jun 2023 11:30:56 +0200
Subject: [PATCH 6/9] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4a4de28..a1da667 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ git clone https://github.com/mundeepl/PiFM
 ```
 This will download the software from this repository
 ```
-chmod +x /home/pi/PiFM/setup-pi4.sh
+chmod +x /home/<your_username>/PiFM/setup-pi4.sh
 ```
 This changes the permissions to allow you to run the setup
 ```
@@ -75,7 +75,7 @@ git clone https://github.com/mundeepl/PiFM
 ```
 This will download the software from this repository
 ```
-chmod +x /home/pi/PiFM/setup.sh
+chmod +x /home/<your_username>/PiFM/setup.sh
 ```
 This changes the permissions to allow you to run the setup
 ```

From 238d6396336a49a05dd266984a968c066ee5a548 Mon Sep 17 00:00:00 2001
From: cyber-idiot <136726700+cyber-idiot@users.noreply.github.com>
Date: Sat, 17 Jun 2023 14:34:13 +0200
Subject: [PATCH 7/9] Update pifm-basic.sh

---
 pifm-basic.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pifm-basic.sh b/pifm-basic.sh
index 03f6755..b8e9d09 100644
--- a/pifm-basic.sh
+++ b/pifm-basic.sh
@@ -118,7 +118,7 @@ sleep 1
 echo -ne 'Completed. Starting service PiFM.  \r'
 echo -ne '\n'
 
-
+username=$(whoami)
 # starting the PiFM software with the chosen variable flags
-cd /home/pi/PiFM/src
+cd /home/$username/PiFM/src
 sudo ./pifm --freq $frequency --ps $ps --rt "$rt" --audio $audio --pi $pi --pty $pty --mpx $mpx --power $power --preemph $pre

From 098bea6e9abcedde4fd90f67c3b2504ea8c3b49a Mon Sep 17 00:00:00 2001
From: cyber-idiot <136726700+cyber-idiot@users.noreply.github.com>
Date: Sat, 17 Jun 2023 14:35:04 +0200
Subject: [PATCH 8/9] Update pifm-basic.sh

---
 pifm-basic.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pifm-basic.sh b/pifm-basic.sh
index b8e9d09..f3b992d 100644
--- a/pifm-basic.sh
+++ b/pifm-basic.sh
@@ -118,7 +118,8 @@ sleep 1
 echo -ne 'Completed. Starting service PiFM.  \r'
 echo -ne '\n'
 
-username=$(whoami)
+
 # starting the PiFM software with the chosen variable flags
+username=$(whoami)
 cd /home/$username/PiFM/src
 sudo ./pifm --freq $frequency --ps $ps --rt "$rt" --audio $audio --pi $pi --pty $pty --mpx $mpx --power $power --preemph $pre

From 4641d1591b37797747b25b06ebe17a09b9c33c91 Mon Sep 17 00:00:00 2001
From: cyber-idiot <136726700+cyber-idiot@users.noreply.github.com>
Date: Sat, 17 Jun 2023 14:35:36 +0200
Subject: [PATCH 9/9] Update pifm.sh

---
 pifm.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pifm.sh b/pifm.sh
index 02da931..2199596 100644
--- a/pifm.sh
+++ b/pifm.sh
@@ -114,6 +114,7 @@ zenity --progress --title="PiFM by mundeepl" --percentage=0 --auto-close --auto-
 echo "Completed. Starting service Pi FM RDS"
 
 # Running Pi FM RDS
-cd /home/pi/PiFM/src
+username=$(whoami)
+cd /home/$username/PiFM/src
 sudo ./pifm --ps $ps --rt "$rt" --freq $frequency --audio $audio --preemph $region --pty $genre --power $power
 zenity --title="PiFM by mundeepl" --info --text="Transmission ended. Thank you for using the PiFM Transmission software that was developed by mundeepl. If you would like to use more advanced settings, be sure to check out the README file in the /home/pi/PiFM directory. This will teach you further arguements and how to use the command line." --width=500 --height=150 --ok-label="Exit"