v1.0.5 - Fix install.sh & requirements.txt bugs

Author: Anteste

.gitignore

@@ -0,0 +1 @@
+**/__pycache__/

conf/conf.py

@@ -22,16 +22,19 @@
 from modules.exit import exit
 
 ans = True
-version = '1.0.4'
+version = '1.0.5'
+home = os.path.expanduser("~")
 
 def reOpen():
     installed = True if os.path.exists("/bin/webmap") else False
 
     if installed:
         os.system("sudo webmap")
+        sys.exit()
 
     else:
         os.system("sudo python3 webmap.py")
+        sys.exit(())
 
 def clear():
     os.system('cls' if os.name == 'nt' else 'clear')

conf/requirements.txt

@@ -1,3 +1,3 @@
-requests==2.25.1
-art==5.1
-termcolor==1.1.0
+requests<=2.25.1
+art<=5.1
+termcolor<=1.1.0

conf/version.txt

@@ -1 +1 @@
-1.0.4
+1.0.5

install.sh

@@ -10,21 +10,20 @@ DEPENDENCIES="nmap nikto git python3-pip"
 
 # Verify the OS witch is using and install on the right one
 if [ "$(grep -Ei 'debian|buntu|mint' /etc/*release)" ]; then ##If need more distributions just add more
-    sudo apt-get install "$DEPENDENCIES" -y
+    sudo apt-get install $DEPENDENCIES -y
 elif [ "$(grep -Ei 'redhat|centos' /etc/*release)" ]; then ##To install on RPM CentOS/RedHat
     os_version=$(cut -d ':' -f5 < /etc/system-release-cpe)
     if [ "$os_version" == 8 ]; then
         sudo dnf install https://extras.getpagespeed.com/release-el8-latest.rpm -y
-        sudo dnf install "$DEPENDENCIES" -y
+        sudo dnf install $DEPENDENCIES -y
     elif [ "$os_version" == 7 ]; then
         sudo rpm -Uvh http://www6.atomicorp.com/channels/atomic/centos/7/x86_64/RPMS/atomic-release-1.0-20.el7.art.noarch.rpm
         sudo rpm  -Uvh http://www6.atomicorp.com/channels/atomic/centos/7/x86_64/RPMS/atomic-release-1.0-21.art.noarch.rpm
         sudo rpm -Uvh  http://www6.atomicorp.com/channels/atomic/centos/7/x86_64/RPMS/atomic-release-1.0-21.art.noarch.rpm
-        sudo yum install "$DEPENDENCIES" -y
-    fi
+        sudo yum install $DEPENDENCIES -y
+    fi  
 fi
 
 pip3 install --user -r conf/requirements.txt
 sudo ln -s "$(pwd)"/webmap.py /usr/local/bin/webmap
-mkdir -pv ~/.opt
-git clone --depth 1 https://github.com/maurosoria/dirsearch.git ~/.opt
+git clone --depth 1 https://github.com/maurosoria/dirsearch.git ~/.local/share/dirsearch

modules/dirsearchscan.py

@@ -7,7 +7,6 @@
 #
 
 import conf.conf as conf
-from os.path import expanduser
 
 def dirsearchScan() :
     print("===================================================================")
@@ -21,7 +20,6 @@ def dirsearchScan() :
     dirOutput = conf.dirOutput(dirOutput, "reports/Dirsearch", dirTarget)
     conf.createDir(dirOutput)
 
-    home = expanduser("~")
-    conf.os.system(f"python3 {home}/.opt/dirsearch/dirsearch.py -u {dirTarget} --simple-report={dirOutput}/dirsearch.txt")
+    conf.os.system(f"python3 {conf.home}/.local/share/dirsearch/dirsearch.py -u {dirTarget} --simple-report={dirOutput}/dirsearch.txt")
 
     print("______________________________________________________________________")

modules/fullscan.py

@@ -48,7 +48,9 @@ def fullScan() :
         conf.clear()
 
         conf.os.system(
-            'gnome-terminal -- bash -c "python3 ~/.opt/dirsearch/dirsearch.py -u '
+            'gnome-terminal -- bash -c "python3 '
+            + conf.home 
+            +'/.local/share/dirsearch/dirsearch.py -u '
             + targetAll
             + " --simple-report="
             + outputAll