diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 502eaca..0000000 --- a/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -*.xml text eol=crlf -*.bat text eol=crlf -*.cmd text eol=crlf diff --git a/Wi-Fi-Sincoolka 5G.xml b/Wi-Fi-Sincoolka 5G.xml new file mode 100644 index 0000000..580d5d4 --- /dev/null +++ b/Wi-Fi-Sincoolka 5G.xml @@ -0,0 +1,64 @@ + + + Sincoolka 5G + + + 53696E636F6F6C6B61203547 + Sincoolka 5G + + + ESS + auto + + + + WPA2 + AES + true + + enabled + 720 + 128 + disabled + + user + + + + 25 + 0 + 0 + 0 + + + + 25 + + + true + radius.sin.cvut.cz + 2b8f1b57330dbba2d07a6c51f70ee90ddab9ad8e + + true + false + + 26 + + false + + + false + false + + + + + + + + + + false + 1813427014 + + diff --git a/Wi-Fi-Sincoolka.xml b/Wi-Fi-Sincoolka.xml index 4415f18..e739e87 100644 --- a/Wi-Fi-Sincoolka.xml +++ b/Wi-Fi-Sincoolka.xml @@ -6,11 +6,9 @@ 53696E636F6F6C6B61 Sincoolka - false ESS auto - false @@ -24,34 +22,39 @@ disabled true - user + user - - - 21 - 0 - 0 - 311 - - - - - radius.sin.cvut.cz - 2b 8f 1b 57 33 d bb a2 d0 7a 6c 51 f7 e e9 d da b9 ad 8e - true - - - - - - true - anonymous@sin.cvut.cz - - - - - + + + 25 + 0 + 0 + 0 + + + + 25 + + + true + radius.sin.cvut.cz + 2b8f1b57330dbba2d07a6c51f70ee90ddab9ad8e + + true + false + + 26 + + false + + + false + false + + + + + @@ -59,4 +62,4 @@ false 1813427014 - \ No newline at end of file + diff --git a/Wi-Fi-Sincoolka5G.xml b/Wi-Fi-Sincoolka5G.xml deleted file mode 100644 index 8033972..0000000 --- a/Wi-Fi-Sincoolka5G.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - Sincoolka 5G - - - 53696E636F6F6C6B61203547 - Sincoolka 5G - - false - - ESS - auto - false - - - - WPA2 - AES - true - - enabled - 10 - 128 - disabled - - true - user - - - - 21 - 0 - 0 - 311 - - - - - radius.sin.cvut.cz - 2b 8f 1b 57 33 d bb a2 d0 7a 6c 51 f7 e e9 d da b9 ad 8e - true - - - - - - true - anonymous@sin.cvut.cz - - - - - - - - - - false - 1813427014 - - \ No newline at end of file diff --git a/Wi-Fi-SincoolkaFT.xml b/Wi-Fi-SincoolkaFT.xml deleted file mode 100644 index c51926c..0000000 --- a/Wi-Fi-SincoolkaFT.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - Sincoolka FT - - - 53696E636F6F6C6B61204654 - Sincoolka FT - - false - - ESS - auto - false - - - - WPA2 - AES - true - - enabled - 10 - 128 - disabled - - true - user - - - - 21 - 0 - 0 - 311 - - - - - radius.sin.cvut.cz - 2b 8f 1b 57 33 d bb a2 d0 7a 6c 51 f7 e e9 d da b9 ad 8e - true - - - - - - true - anonymous@sin.cvut.cz - - - - - - - - - - false - 1813427014 - - \ No newline at end of file diff --git a/sin-setup.bat b/sin-setup.bat index 0d4a6a6..1d7f8b8 100644 --- a/sin-setup.bat +++ b/sin-setup.bat @@ -7,15 +7,12 @@ set rights_admin=0 NET SESSION >nul 2>&1 IF NOT %ERRORLEVEL% EQU 0 ( - echo ############### !! FRIENDLY NOTICE ############## - echo # Please, run this script as an administrator. # - echo # Otherwise, the added Wi-Fi network will # - echo # NOT remember your username and password. # - echo # # - echo # Please close this window, right-click the # - echo # sin-setup.bat, and select # - echo # Run as administrator. # - echo ################################################# + echo ####### Running as a regular user ######### + echo # The Wi-Fi profiles will be installed # + echo # for the current user. # + echo # Run as administrator to install them # + echo # for all users. # + echo ########################################### echo. pause ) ELSE ( @@ -31,31 +28,17 @@ IF NOT %ERRORLEVEL% EQU 0 ( :main cls ECHO What you want to do now? -ECHO 1. Configure Wi-Fi connection - Sincoolka FT (recommended) -ECHO 2. Configure Wi-Fi connection - Sincoolka (if the FT does not work properly) -ECHO 3. Configure Wi-Fi connection - Sincoolka 5G (expert, 5 GHz only) -ECHO. -ECHO 4. Remove all Sincoolka profiles -ECHO. -IF %rights_admin% EQU 1 ( -ECHO 5. Configure wired connection for 802.1X -ECHO. -) -ECHO 9. Print MAC adresses -ECHO 0. Exit -ECHO. +ECHO 1. Configure Wi-Fi connection +rem ECHO 2. Configure Wired connection +ECHO 3. Print MAC adresses +ECHO 4. Exit set choice= set /p choice=Choice: if not '%choice%'=='' set choice=%choice:~0,1% -if '%choice%'=='1' goto setup_wifi_ft -if '%choice%'=='2' goto setup_wifi -if '%choice%'=='3' goto setup_wifi_5g -if '%choice%'=='4' goto cleanup_wifi -IF %rights_admin% EQU 1 ( - if '%choice%'=='5' goto setup_eth -) -if '%choice%'=='9' goto print_mac -if '%choice%'=='0' EXIT +if '%choice%'=='1' goto setup_wifi +rem if '%choice%'=='2' goto setup_eth +if '%choice%'=='3' goto print_mac +if '%choice%'=='4' EXIT ECHO "%choice%" is not valid, try again ECHO. goto main @@ -64,22 +47,7 @@ goto main -:: Import Sincoolka FT Wi-Fi profile - -:setup_wifi_ft -cls -set cmd_user=current -IF %rights_admin% EQU 1 ( - set cmd_user=all -) -netsh wlan add profile "filename=%mypath%Wi-Fi-SincoolkaFT.xml" user=%cmd_user% - -echo. - -set /p iface="Press Enter to continue . . . " -goto main - -:: Import Sincoolka Wi-Fi profile +:: Import Sincoolka and Sincoolka 5G Wi-Fi profile :setup_wifi cls @@ -88,21 +56,7 @@ IF %rights_admin% EQU 1 ( set cmd_user=all ) netsh wlan add profile "filename=%mypath%Wi-Fi-Sincoolka.xml" user=%cmd_user% - -echo. - -set /p iface="Press Enter to continue . . . " -goto main - -:: Import Sincoolka 5G Wi-Fi profile - -:setup_wifi_5g -cls -set cmd_user=current -IF %rights_admin% EQU 1 ( - set cmd_user=all -) -netsh wlan add profile "filename=%mypath%Wi-Fi-Sincoolka5G.xml" user=%cmd_user% +netsh wlan add profile "filename=%mypath%Wi-Fi-Sincoolka 5G.xml" user=%cmd_user% echo. @@ -110,17 +64,6 @@ set /p iface="Press Enter to continue . . . " goto main -:cleanup_wifi -cls -:: Cleanup all our Wi-Fi profiles -netsh wlan delete profile name="Sincoolka" i=* -netsh wlan delete profile name="Sincoolka FT" i=* -netsh wlan delete profile name="Sincoolka 5G" i=* - -echo. - -set /p iface="Press Enter to continue . . . " -goto main @@ -155,7 +98,7 @@ echo. :setEth :: Print all network interfaces -echo List of Available Interfaces: +echo List of Avaliable Interfaces: echo. wmic nic where 'NOT Manufacturer like "%%Microsoft%%" and PhysicalAdapter=TRUE and NOT Manufacturer like "%%Windows%%"' get Manufacturer,MACAddress,NetConnectionID 2>nul IF NOT %ERRORLEVEL% EQU 0 ( @@ -191,7 +134,7 @@ goto main :print_mac cls -wmic nic where 'NOT Manufacturer like "%%Microsoft%%" and NOT Manufacturer like "%%Windows%%"' get MACAddress,Caption,NetConnectionID 2>nul +wmic nic where 'NOT Manufacturer like "%%Microsoft%%" and PhysicalAdapter=TRUE and NOT Manufacturer like "%%Windows%%"' get Manufacturer,MACAddress,NetConnectionID 2>nul IF NOT %ERRORLEVEL% EQU 0 ( getmac /v 2>nul IF NOT %ERRORLEVEL% EQU 0 (