Mirrors
/
fluxion
mirror of https://github.com/FluxionNetwork/fluxion.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #265 from Hritik14/feature/ArchRelated 

Feature/arch related
This commit is contained in:
deltax 2017-11-27 15:43:56 +01:00 committed by GitHub
parent d7a9481f33 9382873277
commit a88ebb2e38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fluxion.sh
View File

@ -258,7 +258,7 @@ if [ ! $FLUXIONDebug ]; then
echo echo
FLUXIONCLIToolsRequired=("aircrack-ng" "python2:python2.7|python2" "awk:awk|gawk|mawk" "curl" "dhcpd:isc-dhcp-server" "7zr:p7zip" "hostapd" "lighttpd" "iwconfig:wireless-tools" "macchanger" "mdk3" "nmap" "openssl" "php-cgi" "pyrit" "xterm" "rfkill" "unzip" "route:net-tools" "fuser:psmisc" "killall:psmisc") FLUXIONCLIToolsRequired=("aircrack-ng" "python2:python2.7|python2" "awk:awk|gawk|mawk" "curl" "dhcpd:isc-dhcp-server|dhcp" "7zr:p7zip" "hostapd" "lighttpd" "iwconfig:wireless-tools" "macchanger" "mdk3" "nmap" "openssl" "php-cgi" "pyrit" "xterm" "rfkill" "unzip" "route:net-tools" "fuser:psmisc" "killall:psmisc")
FLUXIONCLIToolsMissing=() FLUXIONCLIToolsMissing=()
while ! installer_utils_check_dependencies FLUXIONCLIToolsRequired[@] while ! installer_utils_check_dependencies FLUXIONCLIToolsRequired[@]

12
lib/installer/managers/pacman.sh
View File

@ -1,8 +1,16 @@
#!/bin/bash #!/bin/bash
if [ -f "/etc/arch-release" ]; then if [ -f "/etc/arch-release" ]; then
PackageManagerCLT="pacman" #Last entry is the default package manager to use (pacman)
PackageManagerCLTInstallOptions="-S -y" AurHelpers="pacaur yaourt pacman"
for AurHelper in $AurHelpers; do
if [ "`pacman -Qs $AurHelper`" ]; then
PackageManagerCLT=$AurHelper
break;
fi
done
PackageManagerCLT='pacman'
PackageManagerCLTInstallOptions="-S --noconfirm"
PackageManagerCLTRemoveOptions="-Rs" PackageManagerCLTRemoveOptions="-Rs"
PackageManagerOutputDevice="/dev/stdout" PackageManagerOutputDevice="/dev/stdout"