From 56dfa5549cc6ffd75bb2515dd29def56b0984193 Mon Sep 17 00:00:00 2001
From: PrincessPi3 <human.bagel@gmail.com>
Date: Sat, 1 Nov 2025 19:16:03 -0600
Subject: [PATCH] ibnstallededd

---
 customscripts/install_script.sh | 96 +++++++++++++++++++--------------
 1 file changed, 56 insertions(+), 40 deletions(-)

diff --git a/customscripts/install_script.sh b/customscripts/install_script.sh
index e8ee6ce..8a9119a 100644
--- a/customscripts/install_script.sh
+++ b/customscripts/install_script.sh
@@ -13,14 +13,14 @@ tmp_customscripts_dir="$tmpDir/customscripts"
 finalDir='/usr/share/customscripts'
 packages="apache2 nginx build-essential cowsay iotop iptraf-ng gh btop screen byobu thefuck wget lynx zip unzip 7zip xz-utils gzip net-tools clamav php restic cifs-utils detox fdupes ripgrep avahi-daemon libnss-mdns xxd xrdp libimage-exiftool-perl kali-tools-hardware kali-tools-crypto-stego kali-tools-fuzzing kali-tools-bluetooth kali-tools-rfid kali-tools-sdr kali-tools-voip kali-tools-802-11 kali-tools-forensics samba procps snapd dotnet-sdk-9.0"
 
-echo "Using Shell $SHELL"
+echo -e "\nSTARTING!\n\tUsing Shell $SHELL\n"
 
 # ta get da right usermayhaps
 if [[ -z $SUDO_USER ]]; then
-    echo "Using User $USER"
+    echo -e "\nUsing User $USER\n"
     username="$USER"
 else
-    echo "Using User $SUDO_USER" 
+    echo -n "\nUsing User $SUDO_USER\n" 
     username="$SUDO_USER"
 fi
 
@@ -37,133 +37,145 @@ else
     exit 1
 fi
 
+echo -e "\nusing rcfile $rcfile\n"
+
 if [ ! -z "$1" ]; then
+    echo -e "\nFULL MODE SELECTED FULL UPGRADE AND INSTALL PACKAGES!\n"
     # update and upgrade
-    echo "Updating software lists"
+    echo -e "\nUpdating software lists\n"
     sudo apt update
-    echo "Doin full-upgrade"
+    echo -e "\nDoin full-upgrade\n"
     sudo apt full-upgrade -y
     # dotnet
     if [ ! $(which dotnet) ]; then
+        echo -e "\ndotnet not found, installing\n"
         ## install da repo
+        echo -e "\ninstallan dotnet repo\n"
         wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O /tmp/packages-microsoft-prod.deb
         sudo dpkg -i /tmp/packages-microsoft-prod.deb
         rm -f /tmp/packages-microsoft-prod.deb
         ## re-update
+        echo -e "\nUpdating software lists\n"
         sudo apt update
     else
-        echo "dotnet installed, skipping install of repo"
+        echo -e "\ndotnet installed, skipping install of repo\n"
     fi
     # install packages
-    echo "Installan my packages"
+    echo -e "\nInstallan my packages\n"
+    sudo bash -c "apt install $packages -y"
     ## dotnet
     ### haveibeenpwned-downloader
     if [ ! $(which haveibeenpwned-downloader) ]; then
+        echo -e "\nhaveibeenpwned-downloader not found, installing with dotnet\n"
         sudo dotnet tool install --global haveibeenpwned-downloader
-        sudo bash -c "apt install $packages -y"
     else
-        echo "haveibeenpwned-downloader installed, skipping install"
+        echo -e "\nhaveibeenpwned-downloader installed, skipping install\n"
     fi
     # homebrew
     if [ ! $(which brew) ]; then
-    ## install homebrew
-    test -d ~/.linuxbrew && eval "$(~/.linuxbrew/bin/brew shellenv)"
-    test -d /home/linuxbrew/.linuxbrew && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-    ### add to rcfile
-    echo "# linuxbrew (homebrew/brew)" >> $rcfile
-    echo "eval \"\$($(brew --prefix)/bin/brew shellenv)\"" >> $rcfile
+        ## install homebrew
+        echo -e "\nlinuxbrew not found, installing\n"
+        test -d ~/.linuxbrew && eval "$(~/.linuxbrew/bin/brew shellenv)"
+        test -d /home/linuxbrew/.linuxbrew && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+        ### add to rcfile
+        echo "# linuxbrew (homebrew/brew)" >> $rcfile
+        echo "eval \"\$($(brew --prefix)/bin/brew shellenv)\"" >> $rcfile
     else
-        echo "linuxbrew installed, skipping install"
+        echo -e "\nlinuxbrew installed, skipping install\n"
     fi
     ### install ponysay
     if [ ! $(which ponysay) ]; then
+        echo -e "\nponysay not fonud, installiing\n"
         brew install ponysay
         echo -e "# ponysay fix\nexport PYTHONWARNINGS=ignore::SyntaxWarning" >> $rcfile
     else
-        echo "ponysay already installed, skipping"
+        echo -e "\nponysay already installed, skipping\n"
     fi
     # cleanup
-    echo "cleanan upps"
+    echo -e "\ncleanan upps\n"
     sudo apt autoremove -y
 else
-    echo "skipping package install"
+    echo -e "\nskipping package install\n"
 fi
 
 # get the existing tag and webhooks if any
 if [ -f $finalDir/tag.txt ]; then
-    echo "Found existing tag.txt, backing up"
+    echo -e "\nFound existing tag.txt, backing up\n"
     cp $finalDir/tag.txt /tmp/tag.txt
 else
-    echo "no existing tag.txt, skipping backup of it"
+    echo -e "\nno existing tag.txt, skipping backup of it\n"
 fi
 
 # backup webhook if present
 if [ -f $finalDir/webhook.txt ]; then
-    echo "Found existing webhook.txt, backing up"
+    echo -e "\nFound existing webhook.txt, backing up\n"
     cp $finalDir/webhook.txt /tmp/webhook.txt
 else
-    echo "no existing webhook.txt, skipping backup of it"
+    echo -e "\nno existing webhook.txt, skipping backup of it\n"
 fi
 
 # clean up any exisiting repo dir
 if [[ -d "$tmpDir" ]]; then
-    echo "Cleaning Up Existing $tmpDir"
+    echo "\nCleaning Up Existing $tmpDir\n"
     rm -rf "$tmpDir"
 else
-    echo "$tmpDir not found, skipping deleting it"
+    echo -e "\n$tmpDir not found, skipping deleting it\n"
 fi
 
 # clean up any existing install
 if [[ -d "$finalDir" ]]; then
-    echo "Cleaning Up Existing $finalDir"
+    echo -e "\nCleaning Up Existing $finalDir\n"
     sudo rm -rf "$finalDir"
 else
-    echo "$finalDir not found, will create"
+    echo -e "\n$finalDir not found, will create\n"
 fi
 
 # ddownload repo
-echo "Cloning Repo $gitRepo"
+echo -e "\nCloning Repo $gitRepo\n"
 git clone $gitRepo $tmpDir --single-branch --depth 1
 
-echo "Compiling donut"
+# donut
+echo -e "\nCompiling donut\n"
 gcc -o "$tmp_customscripts_dir/donut" "$tmp_customscripts_dir/donut.c" -lm
 
 # put the customscripts dir into place
-echo "Placing in $finalDir"
+echo -e "\nPlacing in $finalDir\n"
 sudo mv "$tmp_customscripts_dir" "$finalDir"
 
 # fix ownership
-echo "Changing ownership of $finalDir and $userhome/Rice to $username:$username recursively"
+echo -e "\nChanging ownership of $finalDir and $userhome/Rice to $username:$username recursively\n"
 sudo chown -R $username:$username "$finalDir"
 sudo chown -R $username:$username $userhome/Rice
 
 # fix perms
-echo "Setting perms of $finalDir and contents to 775"
+echo -e "\nSetting perms of $finalDir and contents to 775\n"
 sudo chmod -R 775 "$finalDir"
 
 # check if $finalDir is in $rcfile
 grep -q $finalDir $rcfile
 pathgrep=$?
 if [ $pathgrep -eq 0 ]; then
-    echo "$finalDir Already in \$PATH Skipping"
+    echo -e "\n$finalDir Already in \$PATH Skipping Append\n"
 else
-    echo "Adding $finalDir to $username's \$PATH by Appending to $rcfile"
+    echo -e "\nAdding $finalDir to $username's \$PATH by Appending to $rcfile\n"
     echo -e "\n\n# automatically added by customscripts installer\nexport PATH=\"\$PATH:$finalDir\"" >> "$rcfile"
 fi
 
 # install pishrink if not there
 if [ ! -f /usr/local/bin/pishrink ]; then
+    echo -e "\npishrink not found, installing\n"
     wget https://raw.githubusercontent.com/Drewsif/PiShrink/master/pishrink.sh
     mv pishrink.sh pishrink
     chmod +x pishrink
     sudo mv pishrink /usr/local/bin
 else
-    echo "Pishrink already installed, skipping"
+    echo -e "\nPishrink already installed, skipping\n"
 fi
 
 # install ble.sh if not there
 if [ ! -d $userhome/.local/share/blesh ]; then
     # install ble.sh
+    echo -e "\nble.sh not found, installing\n"
     git clone --recursive --depth 1 --shallow-submodules https://github.com/akinomyoga/ble.sh.git
     make -C ble.sh install PREFIX=$userhome/.local
     echo '# ble.sh' >> $rcfile
@@ -171,26 +183,29 @@ if [ ! -d $userhome/.local/share/blesh ]; then
     source $rcfile
     exec "$SHELL"
 else
-    echo "ble.sh already installed, skippping"
+    echo -e "\nble.sh already installed, skippping\n"
 fi
 
 # appeend thefuck to rcfile if not present
 grep -q thefuck $rcfile
 thefuck_present=$?
 if [ $thefuck_present -ne 0 ]; then 
+    echo -e "\nthefuck alias not fonud in $rcfile, adding\n"
     echo -e "# thefuck\neval \$(thefuck --alias fuck)" >> $rcfile
 else
-    echo "thefuck is already in $rcfile, skipping"
+    echo -e "\nthefuck is already in $rcfile, skipping\n"
 fi
 
 # copy rice if not present
 if [ ! -d $userhome/Rice ]; then
+    echo -e "\n$userhome/Rice not found, adding\n"
     mv $tmpDir/Rice $userhome
 else
-    echo "Rice found not copying again"
+    echo -e "\nRice found not copying again\n"
 fi
 
 # cleanup
+echo -e "\ncleaning up temp files\n"
 ## installer
 sudo rm -f "$finalDir/install_script.sh"
 rm /tmp/install_script.sh
@@ -200,9 +215,10 @@ sudo rm -rf "$tmpDir"
 rm -f "$tmp_customscripts_dir/donut.c"
 
 if [ ! -z "$1" ]; then
+    echo -e "cleaning up apt"
     sudo apt autoremove -y
-    echo "rebooting in 3 minutes"
+    echo -e "\nrebooting in 3 minutes\n"
     sudo shutdown -r +3
 fi
 
-echo "Done with first stage"
\ No newline at end of file
+echo -e "\nDone with first stage \n"
\ No newline at end of file