diff --git a/fluxion.sh b/fluxion.sh index 22ae11d..f877fd2 100755 --- a/fluxion.sh +++ b/fluxion.sh @@ -258,7 +258,7 @@ if [ ! $FLUXIONDebug ]; then 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=() while ! installer_utils_check_dependencies FLUXIONCLIToolsRequired[@] diff --git a/lib/installer/managers/pacman.sh b/lib/installer/managers/pacman.sh index ea176e3..f808010 100755 --- a/lib/installer/managers/pacman.sh +++ b/lib/installer/managers/pacman.sh @@ -1,8 +1,16 @@ #!/bin/bash if [ -f "/etc/arch-release" ]; then - PackageManagerCLT="pacman" - PackageManagerCLTInstallOptions="-S -y" + #Last entry is the default package manager to use (pacman) + 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" PackageManagerOutputDevice="/dev/stdout"