remove iconv, fixes #35

QSCTech · Oct 2, 2014 · 00cd078 · 00cd078
1 parent b614536
commit 00cd078
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -18,16 +18,10 @@ Command Line Scripts for ZJU (VPN / WLAN / DNS)
 
 ## Requirements
 
-### vpn
-
 - xl2tpd
 
-### wlan
-
 - curl
 
-- iconv
-
 ## Install
 
 ### From source

diff --git a/build/build.sh b/build/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=0.1.0-17
+VERSION=0.1.0-18
 
 cd debian
 ./build.sh $VERSION > /dev/null

diff --git a/lib/wlan.sh b/lib/wlan.sh
@@ -2,7 +2,7 @@
 
 # wlan.sh -- login/logout for ZJUWLAN
 #
-# Requirements: curl, iconv
+# Requirements: curl
 #
 # Copyright (C) 2014 Zhang Hai <Dreaming.in.Code.ZH@Gmail.com>
 # Copyright (C) 2014 Zeno Zeng <zenoofzeng@gmail.com>
@@ -56,7 +56,7 @@ login() {
     logout $USERNAME $PASSWORD
 
     echo "Login: ${USERNAME}"
-    RESPONSE=$(curl "https://net.zju.edu.cn/cgi-bin/srun_portal" -H "Content-Type: application/x-www-form-urlencoded" -d "action=login&username=${USERNAME}&password=${PASSWORD}&ac_id=3&type=1&is_ldap=1&local_auth=1" -s | iconv -c -f gbk -t utf8)
+    RESPONSE=$(curl "https://net.zju.edu.cn/cgi-bin/srun_portal" -H "Content-Type: application/x-www-form-urlencoded" -d "action=login&username=${USERNAME}&password=${PASSWORD}&ac_id=3&type=1&is_ldap=1&local_auth=1" -s)
 
     case "${RESPONSE}" in
         *help.html*)