diff --git a/res/miracle-wifi.sh b/res/miracle-wifi.sh index ecf97c7..bca8b8e 100755 --- a/res/miracle-wifi.sh +++ b/res/miracle-wifi.sh @@ -1,4 +1,54 @@ +#!/bin/bash + ./kill-wpa.sh -echo starting wpa_supplicant for miraclecast -sudo wpa_supplicant -dd -B -iwlp3s0 -Dnl80211 -c wpa.conf +. miracle-utils.sh + +WIFI_NAMES=$(find_wireless_connected_network_interfaces) +WIFI_COUNT=$(echo "$WIFI_NAMES" | wc -l) + +if [ 0 = $WIFI_COUNT ] +then + echo There is no wireless devices connected + # choose from any existing wireless interface + WIFI_NAMES=$(find_wireless_network_interfaces) + WIFI_COUNT=$(echo "$WIFI_NAMES" | wc -l) +fi + +if [ 0 = $WIFI_COUNT ] +then + echo There is no avaliable wireless devices + exit 1 +elif [ 1 = $WIFI_COUNT ] +then + WIFI_NAME="$WIFI_NAMES" +elif [ 2 -le $WIFI_COUNT ] +then + echo Choose wireless device: + PS3="device: " + QUIT="exit" + select wifi_name in $WIFI_NAMES $QUIT + do + case $wifi_name + in + "$QUIT") + exit + ;; + "") + if [ "$REPLY" = $QUIT ] + then + exit + else + echo unknow $REPLY + fi + ;; + *) + WIFI_NAME=$wifi_name + break + ;; + esac + done +fi + +echo starting wpa_supplicant for miraclecast on $WIFI_NAME +sudo wpa_supplicant -dd -B -u -i$WIFI_NAME -Dnl80211 -c$(dirname $0)/wpa.conf diff --git a/res/normal-wifi.sh b/res/normal-wifi.sh index 0bd8a68..9bf4931 100755 --- a/res/normal-wifi.sh +++ b/res/normal-wifi.sh @@ -1,5 +1,55 @@ ./kill-wpa.sh -CONFIG_FILE=${1:-/run/network/wpa_supplicant_wlp3s0.conf} +. miracle-utils.sh + +ETHER_NAMES=$(find_choosable_networknames) + +ETHER_COUNT=$(echo "$ETHER_NAMES" | wc -l) + +if [ 0 = $ETHER_COUNT ] +then + echo There is no net devices avaliable + exit 1 +elif [ 1 = $ETHER_COUNT ] +then + ETHERNAME="$ETHER_NAMES" +elif [ 2 -le $ETHER_COUNT ] +then + echo choose device for normal connection: + QUIT="exit" + select et_name in $ETHER_NAMES $QUIT + do + case $et_name + in + "$QUIT") + exit + ;; + "") + if [ "$REPLY" = $QUIT ] + then + exit + else + echo unknow $REPLY + fi + ;; + *) + ETHERNAME=$et_name + break + ;; + esac + done +fi + +# default path for config file +CONFIG_FILE=${1:-/run/network/wpa_supplicant_${ETHERNAME}.conf} + + echo starting wpa_supplicant for normal connection -sudo wpa_supplicant -B -P /run/wpa_supplicant_wlp3s0.pid -i wlp3s0 -D nl80211,wext -c$CONFIG_FILE +if check_ubuntu_distro +then + start_ubuntu_network_manager + sudo wpa_supplicant -B -u -s -O /var/run/wpa_supplicant +else + sudo wpa_supplicant -B -u -P /run/wpa_supplicant_${ETHERNAME}pid -i ${ETHERNAME} -D nl80211 -c$CONFIG_FILE +fi +