Merge pull request #97 from v1s1t0r1sh3r3/dev

Dev to master v7.2

CHANGELOG.md

@@ -1,3 +1,10 @@
+### 7.2
+ - Improved chipset detection
+ - New language and options menu
+ - Colorization, auto-update and startup language autodetection now can be enabled/disabled persistently from menu
+ - Language can be set permanently from menu even for next startup after an update
+ - New check using xset internal tool to check for a working X window system in order to avoid uncontrolled xterm errors
+
 ### 7.11
  - Added hccapx support for hashcat 3.40 or higher
  - Decrypted hashcat trophy files beautified
@@ -34,7 +41,7 @@
 ### 6.21
  - Improved chipset detection, lsusb added to internal tools
  - Improved internet checking. Now more methods, not only icmp
- - Fixed error executing airgeddon after auto update on some distros
+ - Fixed error executing airgeddon after auto-update on some distros
  - Added LICENSE.md and README.md files to Kali package
 
 ### 6.2

Dockerfile

@@ -10,16 +10,17 @@ LABEL \
 	maintainer="OscarAkaElvis <[email protected]>" \
 	description="This is a multi-use bash script for Linux systems to audit wireless networks."
 
-#Url env vars
+#Env vars
 ENV AIRGEDDON_URL="https://github.com/v1s1t0r1sh3r3/airgeddon.git"
 ENV HASHCAT2_URL="https://github.com/v1s1t0r1sh3r3/hashcat2.0.git"
+ENV DEBIAN_FRONTEND="noninteractive"
 
 #Update system
-RUN apt-get update
+RUN apt update
 
 #Set locales
 RUN \
-	apt-get -y install \
+	apt -y install \
 	locales && \
 	locale-gen en_US.UTF-8 && \
 	sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
@@ -34,7 +35,7 @@ ENV LC_ALL="en_US.UTF-8"
 
 #Install airgeddon essential tools
 RUN \
-	apt-get -y install \
+	apt -y install \
 	gawk \
 	net-tools \
 	wireless-tools \
@@ -44,24 +45,25 @@ RUN \
 
 #Install airgeddon internal tools
 RUN \
-	apt-get -y install \
+	apt -y install \
 	ethtool \
 	pciutils \
 	usbutils \
 	rfkill \
 	x11-utils \
 	wget \
-	ccze
+	ccze \
+	x11-xserver-utils
 
 #Install update tools
 RUN \
-	apt-get -y install \
+	apt -y install \
 	curl \
 	git
 
 #Install airgeddon optional tools
 RUN \
-	apt-get -y install \
+	apt -y install \
 	crunch \
 	hashcat \
 	mdk3 \
@@ -79,7 +81,7 @@ RUN \
 
 #Install needed Ruby gems
 RUN \
-	apt-get -y install \
+	apt -y install \
 	beef-xss \
 	bettercap
 
@@ -119,9 +121,9 @@ RUN \
 
 #Clean packages
 RUN \
-	apt-get clean && \
-	apt-get autoclean && \
-	apt-get autoremove
+	apt clean && \
+	apt autoclean && \
+	apt autoremove
 
 #Clean files
 RUN rm -rf /opt/airgeddon/imgs > /dev/null 2>&1 && \
@@ -131,7 +133,8 @@ RUN rm -rf /opt/airgeddon/imgs > /dev/null 2>&1 && \
 	rm -rf /opt/airgeddon/Dockerfile > /dev/null 2>&1 && \
 	rm -rf /opt/airgeddon/binaries > /dev/null 2>&1 && \
 	rm -rf /opt/hashcat2.0 > /dev/null 2>&1 && \
-	rm -rf /tmp/* > /dev/null 2>&1
+	rm -rf /tmp/* > /dev/null 2>&1 && \
+	rm -rf /var/lib/apt/lists/* > /dev/null 2>&1
 
 #Expose BeEF control panel port
 EXPOSE 3000

README.md

@@ -6,7 +6,7 @@
 
 ---
 
-All the needed info about how to install|use|enjoy `airgeddon` is present at [Github's Wiki].
+All the needed info about how to "install | use | enjoy" `airgeddon` is present at [Github's Wiki].
 
 - *I. Content & Features*
   - [Home]
@@ -74,7 +74,7 @@ All the needed info about how to install|use|enjoy `airgeddon` is present at [Gi
 [Hat Tip To]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Hat%20Tip%20To
 [Inspiration]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Inspiration
 
-[Version-shield]: https://img.shields.io/badge/version-7.11-blue.svg?style=flat-square&colorA=273133&colorB=0093ee "Latest version"
+[Version-shield]: https://img.shields.io/badge/version-7.2-blue.svg?style=flat-square&colorA=273133&colorB=0093ee "Latest version"
 [Bash4.2-shield]: https://img.shields.io/badge/bash-4.2%2B-blue.svg?style=flat-square&colorA=273133&colorB=00db00 "Bash 4.2 or later"
 [License-shield]: https://img.shields.io/badge/license-GPL%20v3%2B-blue.svg?style=flat-square&colorA=273133&colorB=bd0000 "GPL v3+"
 [Docker-shield]: https://img.shields.io/docker/automated/v1s1t0r1sh3r3/airgeddon.svg?style=flat-square&colorA=273133&colorB=f9ff5a "Docker rules!"