clean code

README.md

@@ -1,19 +1,15 @@
 # PenTools
 
-![terminal](https://github.com/d3vyce/PenTools/blob/main/images/terminal.png)
+Presentation of the tools...
 
 # Quick Start
 
-Before running the script make sure you have `go`, `pip` and `rust` installed.
+Before running the script make sure you have `go` and `pip` installed.
-```bash
+
-# https://phoenixnap.com/kb/debian-install-go
-sudo apt install python-pip # pip
-curl https://sh.rustup.rs -sSf | sh # rust
-```
-To run the script use the following command:
 ```Bash
-bash <(curl -L https://github.com/d3vyce/PenTools/releases/latest/download/pentools.sh)
+curl -L https://github.com/d3vyce/pentools/releases/latest/download/pentools.sh | sh
 ```
+
 This script has been tested on debian distribution, but it should also work with Ubuntu.
 I'm working on a compatibility with CentOS and other distribution.
 
@@ -22,19 +18,12 @@ I'm working on a compatibility with CentOS and other distribution.
 - rockyou.txt
 - common.txt
 - subdomains.txt
-- directory-list-2.3-medium.txt
-- password.lst
-- nmap.lst
 
 ## Software
 - Sublime Text
-- Obsidian
 - Chrome (+Extension: Dark Reader, FoxyProxy, WappAnalyser, Hack-Tools)
 - FFUF
 - PWNcat
-- Chisel
-- Nuclei
-- sshuttle
 
 ## Tools
 - linPeas
@@ -47,8 +36,5 @@ I'm working on a compatibility with CentOS and other distribution.
 - nmap
 
 ## Alias
-- Python server file in pentools folder (command: `filesrv`)
+- Python server file
-- Open Sublime-Text (command : `sublime`) -> To open Sublime-Text in current folder : `sublime .`
+- Sublime-Text
-
-# Contribute to the project
-To participate in the project, you can propose new implementations of tools/binary/software/... via issues or merge request.

pentools.sh

@@ -20,15 +20,6 @@ wordlist() {
 
      printf ${GREEN}"[+] subdomains.txt\n"
      curl http://ffuf.me/wordlist/subdomains.txt > $TARGET/wordlist/subdomains.txt 2>&1
-
-     printf ${GREEN}"[+] directory-list-2.3-medium.txt\n"
-     curl https://raw.githubusercontent.com/daviddias/node-dirbuster/master/lists/directory-list-2.3-medium.txt > $TARGET/wordlist/directory-list-2.3-medium.txt 2>&1
-
-     printf ${GREEN}"[+] password.lst\n"
-     curl https://raw.githubusercontent.com/piyushcse29/john-the-ripper/master/run/password.lst > $TARGET/wordlist/password.lst 2>&1
-
-     printf ${GREEN}"[+] nmap.lst\n"
-     curl https://raw.githubusercontent.com/drtychai/wordlists/master/nmap.lst > $TARGET/wordlist/nmap.lst 2>&1
 }
 
 software() {
@@ -37,17 +28,11 @@ software() {
      printf ${GREEN}"[+] Sublime-text\n"
      wget -qO - https://download.sublimetext.com/sublimehq-pub.gpg | sudo apt-key add - >/dev/null 2>&1
      echo "deb https://download.sublimetext.com/ apt/stable/" | sudo tee /etc/apt/sources.list.d/sublime-text.list >/dev/null 2>&1
-     sudo apt update >/dev/null 2>&1
      sudo apt -y install sublime-text >/dev/null 2>&1
 
-     printf ${GREEN}"[+] Obsidian\n"
-     wget https://github.com/obsidianmd/obsidian-releases/releases/download/v1.1.9/obsidian_1.1.9_amd64.deb >/dev/null 2>&1
-     sudo apt install ./obsidian_1.1.9_amd64.deb >/dev/null 2>&1
-     rm obsidian_1.1.9_amd64.deb
-
      printf ${GREEN}"[+] Chrome\n"
-     wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb >/dev/null 2>&1
+     wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-     sudo apt -y install ./google-chrome-stable_current_amd64.deb >/dev/null 2>&1
+     sudo apt -y install ./google-chrome-stable_current_amd64.deb
      rm google-chrome-stable_current_amd64.deb
 
      sudo mkdir /opt/google/chrome/extensions >/dev/null 2>&1
@@ -79,44 +64,20 @@ software() {
   "external_update_url": "https://clients2.google.com/service/update2/crx"
 }' > /opt/google/chrome/extensions/cmbndhnoonmghfofefkcccljbkdpamhi.json
 
-     printf ${GREEN}"[+] sshuttle\n"
-     sudo apt install sshuttle >/dev/null 2>&1
-     
-     printf ${GREEN}"[+] nuclei\n"
-     sudo apt install nuclei >/dev/null 2>&1
-
      if ! command -v go &> /dev/null
      then
-          printf ${RED}"[x] Missing Go, skipping install of Fuff, Chisel and Nuclei...\n"
+          printf ${RED}"[x] Missing Go, skiping install of Fuff...\n"
      else
-          if ! command -v ffuf &> /dev/null
+          printf ${GREEN}"[+] ffuf\n"
-          then
+          go install github.com/ffuf/ffuf@latest  
-               printf ${GREEN}"[+] ffuf\n"
-               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
-               printf ${GREEN}"[+] chisel\n"
-               go install github.com/jpillora/chisel@latest >/dev/null 2>&1
-          else
-               printf ${ITALIC_LIGHT_CYAN}"[~] chisel is already installed, skipping...\n"
-          fi
      fi
 
      if ! command -v pip &> /dev/null
      then
-          printf ${RED}"[x] Missing Pip, skipping install of PwnCat...\n"
+          printf ${RED}"[x] Missing Pip, skiping install of PwnCat...\n"
      else
-          if ! command -v pwncat-cs &> /dev/null
+          printf ${GREEN}"[+] pwncat-cs\n"
-          then
+          pip install pwncat-cs
-               printf ${GREEN}"[+] pwncat-cs\n"
-               sudo pip install pwncat-cs >/dev/null 2>&1
-          else
-               printf ${ITALIC_LIGHT_CYAN}"[~] pwncat-cs is already installed, skipping...\n"
-          fi
      fi
 }
 
@@ -155,22 +116,18 @@ binary() {
 aliascmd() {
      printf "\n${YELLOW}[*]${BLUE} Alias ------------------------------------\n"
 
-     FILE=~/.bash_aliases
+     sed -i '/# Alias created by PenTools/,/# https:\/\/github.com\/d3vyce\/pentools/d' ~/.bashrc
-     if [ -f "$FILE" ]; then
-          sed -i '/# Alias created by PenTools/,/# https:\/\/github.com\/d3vyce\/pentools/d' ~/.bash_aliases
-     fi
 
      echo "
-# Alias created by PenTools" >> ~/.bash_aliases
+# Alias created by PenTools" >> ~/.bashrc
 
      printf ${GREEN}"[+] sudo filesrv\n"
-     echo "alias filesrv='sudo python3 -m http.server 80 --directory ${TARGET}'" >> ~/.bash_aliases
+     echo "alias filesrv='sudo python3 -m http.server 80 --directory ${TARGET}'" >> ~/.bashrc
 
      printf ${GREEN}"[+] sublime\n"
-     echo "alias sublime='/opt/sublime_text/sublime_text'" >> ~/.bash_aliases
+     echo "alias sublime='/opt/sublime_text/sublime_text'" >> ~/.bashrc
 
-     echo "# https://github.com/d3vyce/pentools" >> ~/.bash_aliases
+     echo "# https://github.com/d3vyce/pentools" >> ~/.bashrc
-     source ~/.bash_aliases 
 }
 
 printf "${YELLOW}
@@ -182,7 +139,7 @@ printf "${YELLOW}
   /_/    \___/_/ /_/_/  \____/\____/_/____/  
                                             
  ---------------------------------------------
- v1.1 - ${ITALIC}https://github.com/d3vyce/pentools \n
+ v1.0 - ${ITALIC}https://github.com/d3vyce/pentools \n
 "
 
 printf ${YELLOW}"[*]${BLUE} What do you want to install?\n"
@@ -226,4 +183,4 @@ case $CHOICE in
      *)
           printf "${RED}[x] Select an option between 1 and 6"
           ;;
-esac
+esac