diff --git a/Tools/duco-install-rpi.sh b/Tools/duco-install-rpi.sh
old mode 100644
new mode 100755
index aaa1029f..55c81548
--- a/Tools/duco-install-rpi.sh
+++ b/Tools/duco-install-rpi.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Made by Grantrocks
-
+u="$USER"
 echo "Installing Duino Coin On Your Raspberry Pi"
 sleep 1
 sudo apt update
@@ -33,8 +33,8 @@ mkdir -p ~/.local/share/applications
 echo "[Desktop Entry]
 Name=Duino Coin PC Miner
 Comment=Duino Coin miner for the raspberry pi
-Exec=python3 /home/pi/duino-coin/PC_Miner.py
-Icon=/home/pi/duino-coin/Resources/PCMiner.png
+Exec=python3 /home/$u/duino-coin/PC_Miner.py
+Icon=/home/$u/duino-coin/Resources/PCMiner.png
 Terminal=true
 Type=Application
 Categories=Utility;
@@ -49,10 +49,14 @@ fi
 echo "[Desktop Entry]
 Name=Duino Coin AVR Miner
 Comment=AVR miner for duino coin.
-Exec=python3 /home/pi/duino-coin/AVR_Miner.py
-Icon=/home/pi/duino-coin/Resources/AVRMiner.png
+Exec=python3 /home/$u/duino-coin/AVR_Miner.py
+Icon=/home/$u/duino-coin/Resources/AVRMiner.png
 Terminal=true
 Type=Application
 Categories=Utility;
 StartupNotify=true" > ~/.local/share/applications/duino-coin-avr.desktop
+cd ~/
+if [ -f ~/duco-install-rpi.sh]; then
+    rm duco-install-rpi.sh
+fi
 echo "Installed"
\ No newline at end of file