Update version

.gitea/workflows/shellcheck.yml

@@ -1,14 +0,0 @@
-name: Shellcheck
-on: [push]
-jobs:
-  shellcheck:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Check out repository code
-      uses: actions/checkout@v3
-    - name: Set up shellcheck
-      run: |
-        apt update
-        apt install -y shellcheck                        
-    - name: Analysing the code with shellcheck
-      run: find . -type f -name "*.sh" | xargs shellcheck -S warning

README.md

@@ -1,6 +1,6 @@
 # PenTools
 
-![terminal](images/terminal.png)
+![terminal](https://github.com/d3vyce/PenTools/blob/main/images/terminal.png)
 
 # Quick Start
 

pentools.sh

@@ -13,7 +13,7 @@ wordlist() {
      mkdir $TARGET/wordlist >/dev/null 2>&1
 
      printf ${GREEN}"[+] rockyou.txt\n"
-     wget -q -O - https://github.com/brannondorsey/naive-hashcat/releases/download/data/rockyou.txt > $TARGET/wordlist/rockyou.txt 2>&1
+     curl https://github.com/brannondorsey/naive-hashcat/releases/download/data/rockyou.txt > $TARGET/wordlist/rockyou.txt 2>&1
 
      printf ${GREEN}"[+] common.txt\n"
      curl http://ffuf.me/wordlist/common.txt > $TARGET/wordlist/common.txt 2>&1
@@ -54,35 +54,35 @@ software() {
      printf ${GREEN}"[+] Chrome Extension: FoxyProxy\n"
      sudo touch /opt/google/chrome/extensions/gcknhkkoolaabfmlnjonogaaifnjlfnp.json
      sudo chmod 646 /opt/google/chrome/extensions/gcknhkkoolaabfmlnjonogaaifnjlfnp.json
-     echo '{
+     sudo echo '{
   "external_update_url": "https://clients2.google.com/service/update2/crx"
 }' > /opt/google/chrome/extensions/gcknhkkoolaabfmlnjonogaaifnjlfnp.json
 
      printf ${GREEN}"[+] Chrome Extension: Dark Reader\n"
      sudo touch /opt/google/chrome/extensions/eimadpbcbfnmbkopoojfekhnkhdbieeh.json
      sudo chmod 646 /opt/google/chrome/extensions/eimadpbcbfnmbkopoojfekhnkhdbieeh.json
-     echo '{
+     sudo echo '{
   "external_update_url": "https://clients2.google.com/service/update2/crx"
 }' > /opt/google/chrome/extensions/eimadpbcbfnmbkopoojfekhnkhdbieeh.json
 
      printf ${GREEN}"[+] Chrome Extension: WappAnalyser\n"
      sudo touch /opt/google/chrome/extensions/gppongmhjkpfnbhagpmjfkannfbllamg.json
      sudo chmod 646 /opt/google/chrome/extensions/gppongmhjkpfnbhagpmjfkannfbllamg.json
-     echo '{
+     sudo echo '{
   "external_update_url": "https://clients2.google.com/service/update2/crx"
 }' > /opt/google/chrome/extensions/gppongmhjkpfnbhagpmjfkannfbllamg.json
 
      printf ${GREEN}"[+] Chrome Extension: Hack-Tools\n"
      sudo touch /opt/google/chrome/extensions/cmbndhnoonmghfofefkcccljbkdpamhi.json
      sudo chmod 646 /opt/google/chrome/extensions/cmbndhnoonmghfofefkcccljbkdpamhi.json
-     echo '{
+     sudo echo '{
   "external_update_url": "https://clients2.google.com/service/update2/crx"
 }' > /opt/google/chrome/extensions/cmbndhnoonmghfofefkcccljbkdpamhi.json
 
      printf ${GREEN}"[+] Chrome Extension: Bitwarden\n"
      sudo touch /opt/google/chrome/extensions/nngceckbapebfimnlniiiahkandclblb.json
      sudo chmod 646 /opt/google/chrome/extensions/nngceckbapebfimnlniiiahkandclblb.json
-     echo '{
+     sudo echo '{
   "external_update_url": "https://clients2.google.com/service/update2/crx"
 }' > /opt/google/chrome/extensions/nngceckbapebfimnlniiiahkandclblb.json
 
@@ -101,7 +101,7 @@ software() {
           sudo tar -C /usr/local -xzf go1.20.1.linux-amd64.tar.gz >/dev/null 2>&1
           rm go1.20.1.linux-amd64.tar.gz
           echo 'export PATH=$PATH:/usr/local/go/bin' >> ~/.profile
-          source $HOME/.profile 
+          source ~/.profile 
      fi
 
      if ! command -v ffuf &> /dev/null; then
@@ -109,7 +109,6 @@ software() {
           go install github.com/ffuf/ffuf@latest >/dev/null 2>&1
      else
           printf ${ITALIC_LIGHT_CYAN}"[~] ffuf is already installed, skipping...\n"
-
      fi
 
      if ! command -v chisel &> /dev/null; then
@@ -153,12 +152,6 @@ tools() {
 
      printf ${GREEN}"[+] mimikatz.exe\n"
      wget -q -O - https://github.com/ParrotSec/mimikatz/blob/master/Win32/mimikatz.exe > $TARGET/tools/mimikatz.exe 2>&1
-
-     printf ${GREEN}"[+] Sherlock.ps1\n"
-     curl https://raw.githubusercontent.com/rasta-mouse/Sherlock/master/Sherlock.ps1 > $TARGET/tools/Sherlock.ps1 2>&1
-
-     printf ${GREEN}"[+] laps.py\n"
-     curl https://raw.githubusercontent.com/n00py/LAPSDumper/main/laps.py > $TARGET/tools/laps.py 2>&1
 }
 
 binary() {
@@ -168,10 +161,6 @@ binary() {
      printf ${GREEN}"[+] nmap\n"
      wget -q -O - https://github.com/andrew-d/static-binaries/raw/master/binaries/linux/x86_64/nmap > $TARGET/binary/nmap
      chmod +x $TARGET/binary/nmap
-
-     printf ${GREEN}"[+] pspy64\n"
-     wget -q -O - https://github.com/DominicBreuker/pspy/releases/download/v1.2.1/pspy64 > $TARGET/binary/pspy64
-     chmod +x $TARGET/binary/pspy64
 }
 
 aliascmd() {
@@ -182,13 +171,6 @@ aliascmd() {
           sed -i '/# Alias created by PenTools/,/# https:\/\/github.com\/d3vyce\/pentools/d' ~/.bash_aliases
      fi
 
-     if ! grep -q ".bash_aliases" ~/.zshrc >/dev/null 2>&1; then
-          echo '{
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
-fi}' >> ~/.zshrc
-     fi
-
      echo "
 # Alias created by PenTools" >> ~/.bash_aliases
 
@@ -199,13 +181,13 @@ fi}' >> ~/.zshrc
      echo "alias sublime='/opt/sublime_text/sublime_text'" >> ~/.bash_aliases
 
      printf ${GREEN}"[+] pwncat [port]\n"
-     echo "alias pwncat='sudo pwncat-cs --listen --port '" >> ~/.bash_aliases
+     echo "alias sublime='sudo pwncat-cs --listen --port '" >> ~/.bash_aliases
 
      printf ${GREEN}"[+] openvpn [file.ovpn]\n"
-     echo "alias vpn='sudo openvpn '" >> ~/.bash_aliases
+     echo "alias sublime='sudo openvpn '" >> ~/.bash_aliases
 
      echo "# https://github.com/d3vyce/pentools" >> ~/.bash_aliases
-     source $HOME/.zshrc
+     source ~/.bash_aliases 
 }
 
 printf "${YELLOW}
@@ -217,7 +199,7 @@ printf "${YELLOW}
   /_/    \___/_/ /_/_/  \____/\____/_/____/  
                                             
  ---------------------------------------------
- v1.3 - ${ITALIC}https://github.com/d3vyce/pentools \n
+ v1.2 - ${ITALIC}https://github.com/d3vyce/pentools \n
 "
 
 printf ${YELLOW}"[*]${BLUE} What do you want to install?\n"
@@ -266,16 +248,7 @@ case $CHOICE in
           ;;
 esac
 
-if [ $SSH_GEN == 'y' ]; then
+if [ SSH_GEN -eq 'y' ]; then
-     FILE=~/.ssh/id_rsa
-     if [ -f "$FILE" ]; then
-          read -p "${BLUE}SSH keys are already present, do you want to saved them up before generating new ones? (y/n) [${YELLOW}y${BLUE}]: ${YELLOW}" SSH_SAVE
-          SSH_SAVE=${SSH_SAVE:-y}
-          if [ $SSH_SAVE == 'y' ]; then
-               mv ~/.ssh/id_rsa ~/.ssh/id_rsa.save
-               mv ~/.ssh/id_rsa.pub ~/.ssh/id_rsa.pub.save
-          fi
-     fi
      printf ${GREEN}"[+] Creation of your ssh key pair...\n"
      ssh-keygen -q -t rsa -N '' -f ~/.ssh/id_rsa >/dev/null 2>&1
      printf "${ITALIC_LIGHT_CYAN}"