From 25ef1a429e7cedb250ff71b3dae72b987cc4abe2 Mon Sep 17 00:00:00 2001 From: Dewalt <> Date: Sun, 22 Aug 2021 03:17:34 -0500 Subject: [PATCH] Update Sun Aug 22 03:17:34 AM CDT 2021 --- README.md | 14 ++++++++-- pimpmykali.sh | 76 +++++++++++++++++++++++++-------------------------- 2 files changed, 50 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index 7e22929..cd28634 100644 --- a/README.md +++ b/README.md @@ -58,9 +58,19 @@ - copy of files from /home/kali/* to /root now uses the actual username not just 'kali' - menu option 2 - fix smb.conf - - function updated to use sed -i instead of prior method + - function updated to use sed -i instead of prior method + + - menu option L - Sublime text editor + - installs sublime text editor + + - fix_smbconf function + - function udpated to use sed -i instead of prior method + + - fix_grub function + - function updated to use sed -i instead of prior method - fix_sources function updated to use wildcards + - function updated to use sed -i instead of prior method - Menu clean up, added bold color to "New VM Setup" Menu option N @@ -68,7 +78,7 @@ - Revision History for 1.3.1 and 1.3.0 moved to changelog.txt - Minor code cleanup - + # Menu Breakdown of Pimpmykali - Menu option N (New Users/New VM's Should start here!) diff --git a/pimpmykali.sh b/pimpmykali.sh index c5097ab..94eae79 100755 --- a/pimpmykali.sh +++ b/pimpmykali.sh @@ -255,31 +255,31 @@ fix_hushlogin() { } # 08.18.2021 - fix_qterminal_history - set history for unlimited scrollback -fix_qterminal_history() { - findrealuser=$(who | awk '{print $1}') - if [[ $findrealuser = "root" ]] - then - check_qterminal=$(sudo -i -u $findrealuser cat /root/.config/qterminal.org/qterminal.ini | grep -c "HistoryLimited=true") - if [[ $check_qterminal = 1 ]] - then - echo -e "\n $greenplus Qterminal for $findrealuser not set for unlimited scrollback - fixing" - sudo -i -u $findrealuser cat /root/.config/qterminal.org/qterminal.ini | sed s:"HistoryLimited=true":"HistoryLimited=false":g > /tmp/tmp_qterminal.ini - sudo -i -u $findrealuser cp -f /tmp/tmp_qterminal.ini /root/.config/qterminal.org/qterminal.ini - else - echo -e "\n $greenplus Qterminal $findrealuser already set for unlimited scrollback - skipping" - fi - else - check_qterminal=$(sudo -i -u $findrealuser cat /home/$findrealuser/.config/qterminal.org/qterminal.ini | grep -c "HistoryLimited=true") - if [[ $check_qterminal = 1 ]] - then - echo -e "\n $greenplus Qterminal for $findrealuser not set for unlimited scrollback - fixing" - sudo -i -u $findrealuser cat /home/$findrealuser/.config/qterminal.org/qterminal.ini | sed s:"HistoryLimited=true":"HistoryLimited=false":g > /tmp/tmp_qterminal.ini - sudo -i -u $findrealuser cp -f /tmp/tmp_qterminal.ini /home/$findrealuser/.config/qterminal.org/qterminal.ini - else - echo -e "\n $greenplus Qterminal for $findrealuser already set for unlimited scrollback - skipping" - fi - fi - } +# fix_qterminal_history() { +# findrealuser=$(who | awk '{print $1}') +# if [[ $findrealuser = "root" ]] +# then +# check_qterminal=$(sudo -i -u $findrealuser cat /root/.config/qterminal.org/qterminal.ini | grep -c "HistoryLimited=true") +# if [[ $check_qterminal = 1 ]] +# then +# echo -e "\n $greenplus Qterminal for $findrealuser not set for unlimited scrollback - fixing" +# sudo -i -u $findrealuser cat /root/.config/qterminal.org/qterminal.ini | sed s:"HistoryLimited=true":"HistoryLimited=false":g > /tmp/tmp_qterminal.ini +# sudo -i -u $findrealuser cp -f /tmp/tmp_qterminal.ini /root/.config/qterminal.org/qterminal.ini +# else +# echo -e "\n $greenplus Qterminal $findrealuser already set for unlimited scrollback - skipping" +# fi +# else +# check_qterminal=$(sudo -i -u $findrealuser cat /home/$findrealuser/.config/qterminal.org/qterminal.ini | grep -c "HistoryLimited=true") +# if [[ $check_qterminal = 1 ]] +# then +# echo -e "\n $greenplus Qterminal for $findrealuser not set for unlimited scrollback - fixing" +# sudo -i -u $findrealuser cat /home/$findrealuser/.config/qterminal.org/qterminal.ini | sed s:"HistoryLimited=true":"HistoryLimited=false":g > /tmp/tmp_qterminal.ini +# sudo -i -u $findrealuser cp -f /tmp/tmp_qterminal.ini /home/$findrealuser/.config/qterminal.org/qterminal.ini +# else +# echo -e "\n $greenplus Qterminal for $findrealuser already set for unlimited scrollback - skipping" +# fi +# fi +# } # 06.18.2021 - disable_power_gnome rev 1.2.9 disable_power_gnome() { @@ -312,6 +312,7 @@ disable_power_gnome() { # 06.18.2021 - disable_power_xfce rev 1.2.9 replaces fix_xfce_power fix_xfce_user and fix_xfce_root functions disable_power_xfce() { + # change this to a sed, rather than be dependant on external file if [ $finduser = "root" ] then echo -e "\n $greenplus XFCE Detected - disabling xfce power management \n" @@ -570,9 +571,10 @@ fix_grub () { then echo -e "\n $redexclaim Error: /etc/default/grub is not the default config - not changing" else - cat /etc/default/grub | sed 's/GRUB_CMDLINE_LINUX_DEFAULT="quiet"/GRUB_CMDLINE_LINUX_DEFAULT="quiet mitigations=off"/' > /tmp/fix_grub.tmp - cat /tmp/fix_grub.tmp > /etc/default/grub - rm -f /tmp/fix_grub.tmp + sed 's/GRUB_CMDLINE_LINUX_DEFAULT="quiet"/GRUB_CMDLINE_LINUX_DEFAULT="quiet mitigations=off"/' -i /etc/default/grub + #cat /etc/default/grub | sed 's/GRUB_CMDLINE_LINUX_DEFAULT="quiet"/GRUB_CMDLINE_LINUX_DEFAULT="quiet mitigations=off"/' > /tmp/fix_grub.tmp + #cat /tmp/fix_grub.tmp > /etc/default/grub + #rm -f /tmp/fix_grub.tmp update-grub echo -e "\n $greenplus Added mitigations=off to GRUB_CMDLINE_LINUX_DEFAULT" echo -e "\n $redexclaim Reboot for changes to take effect \n" @@ -637,15 +639,15 @@ fix_sources () { echo -e "\n $greenminus # deb-src or #deb-sec not found - skipping" elif [ $check_space = 1 ]; then echo -e "\n $greenplus # deb-src with space found in sources.list uncommenting and enabling deb-src" - cat /etc/apt/sources.list | sed 's/\# deb-src http\:\/\/.*\/kali kali-rolling main contrib non\-free/\deb-src http\:\/\/'$get_current_mirror'\/kali kali-rolling main contrib non\-free''/' > /tmp/new-sources.list - cat /tmp/new-sources.list > /etc/apt/sources.list - rm /tmp/new-sources.list + sed 's/\# deb-src http\:\/\/.*\/kali kali-rolling main contrib non\-free/\deb-src http\:\/\/'$get_current_mirror'\/kali kali-rolling main contrib non\-free''/' -i /etc/apt/sources.list + #cat /tmp/new-sources.list > /etc/apt/sources.list + #rm /tmp/new-sources.list echo -e "\n $greenplus new /etc/apt/sources.list written with deb-src enabled" elif [ $check_nospace = 1 ]; then echo -e "\n $greenplus #deb-src without space found in sources.list uncommenting and enabling deb-src" - cat /etc/apt/sources.list | sed 's/\#deb-src http\:\/\/.*\/kali kali-rolling main contrib non\-free/\deb-src http\:\/\/'$get_current_mirror'\/kali kali-rolling main contrib non\-free''/' > /tmp/new-sources.list - cat /tmp/new-sources.list > /etc/apt/sources.list - rm /tmp/new-sources.list + sed 's/\#deb-src http\:\/\/.*\/kali kali-rolling main contrib non\-free/\deb-src http\:\/\/'$get_current_mirror'\/kali kali-rolling main contrib non\-free''/' -i /etc/apt/sources.list + #cat /tmp/new-sources.list > /etc/apt/sources.list + #rm /tmp/new-sources.list echo -e "\n $greenplus new /etc/apt/sources.list written with deb-src enabled" fi } @@ -1182,14 +1184,14 @@ gen_new_sources() { mod_debsrc=$(cat /etc/apt/sources.list | grep -c "deb-src http\:\/\/.*\/kali kali\-rolling main contrib non\-free") if [[ $mod_deb = 1 ]] then - cat /etc/apt/sources.list | sed s:"deb http\:\/\/.*\/kali kali\-rolling main contrib non\-free":"deb http\:\/\/"$i"\/kali kali\-rolling main contrib non\-free":g > /tmp/sources.list + sed s:"deb http\:\/\/.*\/kali kali\-rolling main contrib non\-free":"deb http\:\/\/"$i"\/kali kali\-rolling main contrib non\-free":g -i /etc/apt/sources.list else echo "unable to find deb http://*/kali in /etc/apt/sources.list" fi if [[ $mod_debsrc = 1 ]] then i=$(cat /tmp/mirrors_speedtest | sort -n | tail -n1 | cut -d "/" -f3) - cat /tmp/sources.list | sed s:"deb-src http\:\/\/.*\/kali kali\-rolling main contrib non\-free":"deb-src http\:\/\/"$i"\/kali kali\-rolling main contrib non\-free":g > /tmp/final.list + sed s:"deb-src http\:\/\/.*\/kali kali\-rolling main contrib non\-free":"deb-src http\:\/\/"$i"\/kali kali\-rolling main contrib non\-free":g -i /etc/apt/sources.list else echo "unable to find deb-src in /etc/apt/sources.list" fi @@ -1198,8 +1200,6 @@ gen_new_sources() { newdeb=$(cat /etc/apt/sources.list | grep "deb http://" | sed s:"deb http\:\/\/.*\/kali kali\-rolling main contrib non\-free":"deb http\:\/\/"$i"\/kali kali\-rolling main contrib non\-free":g) newdebsrc=$(cat /tmp/sources.list | grep "deb-src http://"| sed s:"deb-src http\:\/\/.*\/kali kali\-rolling main contrib non\-free":"deb-src http\:\/\/"$i"\/kali kali\-rolling main contrib non\-free":g) echo -e "\n $newdeb\n $newdebsrc" - #cat /tmp/final.list #> /etc/apt/sources.list - # add code or function here to ask to apply the changes and backup existing /etc/apt/sources.list echo -e "\n\n Save new changes to /etc/apt/sources.list ?" read -n1 -p " Please type Y or N : " userinput sourcefile=/etc/apt/sources.list