Fix image

* add .gitignore

* add project

* add tools

* add support for alias update

* clean code

* Update pentools.sh

Add check if the software is already installed

* Update pentools.sh

Remove output from chrome install

* Update pentools.sh

* Change running command

* Update pentools.sh

* Fix sublime-text install & Fix Alias

* Update README.md

---------

Co-authored-by: d3vyce <contact@d3vyce.fr>

README.md

@@ -1,15 +1,18 @@
 # PenTools
 
-Presentation of the tools...
+![terminal](https://github.com/d3vyce/PenTools/blob/main/images/terminal.png)
 
 # Quick Start
 
 Before running the script make sure you have `go` and `pip` installed.
-
-```Bash
-curl -L https://github.com/d3vyce/pentools/releases/latest/download/pentools.sh | sh
+```bash
+sudo apt install gccgo-go
+sudo apt install python-pip
+```
+To run the script use the following command:
+```Bash
+bash <(curl -s https://github.com/d3vyce/PenTools/releases/latest/download/pentools.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.
 
@@ -36,5 +39,8 @@ I'm working on a compatibility with CentOS and other distribution.
 - nmap
 
 ## Alias
-- Python server file
-- Sublime-Text
+- Python server file in pentools folder (command: `filesrv`)
+- Open Sublime-Text (command : `sublime`) -> To open Sublime-Text in current folder : `sublime .`
+
+# 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

@@ -28,11 +28,12 @@ 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
      sudo apt -y install sublime-text >/dev/null 2>&1
 
      printf ${GREEN}"[+] Chrome\n"
-     wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-     sudo apt -y install ./google-chrome-stable_current_amd64.deb
+     wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb >/dev/null 2>&1
+     sudo apt -y install ./google-chrome-stable_current_amd64.deb >/dev/null 2>&1
      rm google-chrome-stable_current_amd64.deb
 
      sudo mkdir /opt/google/chrome/extensions >/dev/null 2>&1
@@ -66,18 +67,28 @@ software() {
 
      if ! command -v go &> /dev/null
      then
-          printf ${RED}"[x] Missing Go, skiping install of Fuff...\n"
+          printf ${RED}"[x] Missing Go, skipping install of Fuff...\n"
      else
-          printf ${GREEN}"[+] ffuf\n"
-          go install github.com/ffuf/ffuf@latest  
+          if ! command -v ffuf &> /dev/null
+          then
+               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
      fi
 
      if ! command -v pip &> /dev/null
      then
-          printf ${RED}"[x] Missing Pip, skiping install of PwnCat...\n"
+          printf ${RED}"[x] Missing Pip, skipping install of PwnCat...\n"
      else
-          printf ${GREEN}"[+] pwncat-cs\n"
-          pip install pwncat-cs
+          if ! command -v pwncat-cs &> /dev/null
+          then
+               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
 }
 
@@ -107,9 +118,7 @@ tools() {
 binary() {
      printf "\n${YELLOW}[*]${BLUE} Binary -----------------------------------\n"
      mkdir binary >/dev/null 2>&1
-{
-  "external_update_url": "https://clients2.google.com/service/update2/crx"
-}
+
      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
@@ -118,16 +127,19 @@ binary() {
 aliascmd() {
      printf "\n${YELLOW}[*]${BLUE} Alias ------------------------------------\n"
 
+     sed -i '/# Alias created by PenTools/,/# https:\/\/github.com\/d3vyce\/pentools/d' ~/.bash_aliases
+
      echo "
-# Alias created by PenTools
-# https://github.com/d3vyce/pentools" >> ~/.bashrc
-     
+# Alias created by PenTools" >> ~/.bash_aliases
+
      printf ${GREEN}"[+] sudo filesrv\n"
-     echo "alias filesrv='sudo python3 -m http.server 80 --directory ${TARGET}'" >> ~/.bashrc
+     echo "alias filesrv='sudo python3 -m http.server 80 --directory ${TARGET}'" >> ~/.bash_aliases
 
      printf ${GREEN}"[+] sublime\n"
-     echo "alias sublime='sublime .'" >> ~/.bashrc
+     echo "alias sublime='/opt/sublime_text/sublime_text'" >> ~/.bash_aliases
 
+     echo "# https://github.com/d3vyce/pentools" >> ~/.bash_aliases
+     source ~/.bash_aliases 
 }
 
 printf "${YELLOW}
@@ -183,4 +195,4 @@ case $CHOICE in
      *)
           printf "${RED}[x] Select an option between 1 and 6"
           ;;
-esac
+esac