ibnstaller

customscripts/install_script.sh

@@ -9,7 +9,7 @@ gitRepo='https://github.com/PrincessPi3/general-scripts-and-system-ssssssetup.gi
 tmpDir='/tmp/generalssss'
 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 gunzip 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"
+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"
 
 echo "Using Shell $SHELL"
 
@@ -22,8 +22,8 @@ if [ ! -z "$1" ]; then
     sudo bash -c "apt install $packages -y"
     echo "cleanan upps"
     sudo apt autoremove -y
-    echo "rebootan before run againnn (in 1 minute)"
-    sudo shutdown -r +1
+    # echo "rebootan before run againnn (in 1 minute)"
+    # sudo shutdown -r +1
 fi
 
 # ta get da right usermayhaps
@@ -121,7 +121,9 @@ if [ ! -d $userhome/.local/share/blesh ]; then
 fi
 
 # appeend thefuck to rcfile if not present
-if [ $(rg -q thefuck $rcfile) -ne 0 ]; then 
+grep -q thefuck $rcfile
+thefuck_present=$?
+if [ $thefuck_present -ne 0 ]; then 
     echo -e "# thefuck\neval \$(thefuck --alias fuck)" >> $rcfile
 fi
 
@@ -131,12 +133,14 @@ mv $tmpDir/rice /home/$username/
 # cleanup
 ## installer
 sudo rm -f "$finalDir/install_script.sh"
-
+rm /tmp/install_script.sh
 ## git repo
 sudo rm -rf "$tmpDir"
-
 ## donut c file
 rm -f "$tmp_customscripts_dir/donut.c"
-# sudo apt autoremove -y
+
+if [ ! -z "$1" ]; then
+    sudo apt autoremove -y
+fi
 
 echo "Done with first stage"