diff --git a/readme.md b/readme.md index 35b9a3a..6d69aff 100644 --- a/readme.md +++ b/readme.md @@ -8,6 +8,7 @@ Requirements: * Linux (x86/x86_64) * Gtk+ 3 * sudo +* xterm Usage (interactive mode): ================ @@ -32,6 +33,11 @@ ChangeLog: 3.0 (20160724): * switch to channel 6 (should do stuff faster) * reset wifi interface after work is done (brings back interwebs) +* display short info strings in terminal windows +* use xterm instead of x-terminal-emulator +** some terminals like Konsole need extra arguments (--nofork) +** to properly work as desired, thus enforce xterm so that I +** don't have fiddle around with that stuff * add new payloads: ** US 1.0.1 ** EU-JAP 1.0.1 diff --git a/smashbroshaxer b/smashbroshaxer index 059c6fc..623ce17 100755 --- a/smashbroshaxer +++ b/smashbroshaxer @@ -15,17 +15,29 @@ fi hax_my_smash () { - x-terminal-emulator -e /bin/bash -c \ - "sudo ifconfig ${device} down && \ + xterm -e /bin/bash -c \ + "printf \">> Enter password to access WiFi device: + +\" && \ + sudo ifconfig ${device} down && \ sudo iwconfig ${device} mode monitor && \ sudo ifconfig ${device} up && \ - sudo iwconfig ${device} channel 6​ && \ + sudo iwconfig ${device} channel 6 && \ yes | sudo ${AIREPLAY} \ --interactive \ -r ${replay} \ -h 59:ee:3f:2a:37:e0 \ -x 20 \ - ${device} ; \ + ${device}" ; \ + +} + +reset_wifi () { + + xterm -e /bin/bash -c \ + "printf \">> Enter password to reset WiFi device: + +\" && \ sudo ifconfig ${device} down && \ sudo iwconfig ${device} mode managed && \ sudo ifconfig ${device} up" @@ -63,7 +75,7 @@ interactive_mode () { --separator=" " \ --field=" smashbroshaxer will send data to your 3DS in order for - »Super Smash Bros for 3DS« + »Super Smash Bros for 3DS« to start the Homebrew Launcher. Game version up to 1.1.2 supported; (if you got a newer version, (temporarily) uninstall the update data).:LBL" " " \ @@ -83,7 +95,8 @@ interactive_mode () { replay=${basedir}/pcap/${array[1]} case ${ret} in - 0 ) hax_my_smash ;; + 0 ) hax_my_smash + reset_wifi ;; 2 ) open_3ds_homebrew ;; @@ -125,5 +138,6 @@ usage: fi hax_my_smash + reset_wifi ;; esac