bump version to 0.3.3-5

README.md

@@ -36,8 +36,8 @@ If you meet any problem during or after the installation, check Troubleshooting
 2. Run these command.
 
 ``` bash
-curl https://dl.zjuqsc.com/linux/qsc.public.key | sudo apt-key add -
-curl https://dl.zjuqsc.com/linux/debian/qsc.list | sudo tee /etc/apt/sources.list.d/qsc.list
+curl https://mirrors.zju.edu.cn/openzjunet/zjumirrors.pgp | sudo apt-key add -
+curl https://mirrors.zju.edu.cn/openzjunet/zjunet.list | sudo tee /etc/apt/sources.list.d/zjunet.list
 sudo apt-get update
 sudo apt-get install zjunet
 ```
@@ -56,9 +56,9 @@ sudo apt-get install zjunet
 3. Run these command.
 
 ```bash
-curl https://dl.zjuqsc.com/linux/qsc.public.key | sudo tee /etc/pki/rpm-gpg/RPM-GPG-KEY-QSC-COMP66
-curl https://dl.zjuqsc.com/linux/yum/qsc.repo | sudo tee /etc/yum.repos.d/qsc.repo
-sudo rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-QSC-COMP66
+curl https://mirrors.zju.edu.cn/openzjunet/zjumirrors.pgp | sudo tee /etc/pki/rpm-gpg/RPM-GPG-KEY-ZJUMIRRORS
+curl https://mirrors.zju.edu.cn/openzjunet/zjunet.repo | sudo tee /etc/yum.repos.d/zjunet.repo
+sudo rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-ZJUMIRRORS
 sudo yum install zjunet
 ```
 

README.zh.md

@@ -39,8 +39,8 @@
 2. 依次输入并执行下列命令：
 
 ``` bash
-curl https://dl.zjuqsc.com/linux/qsc.public.key | sudo apt-key add -
-curl https://dl.zjuqsc.com/linux/debian/qsc.list | sudo tee /etc/apt/sources.list.d/qsc.list
+curl https://mirrors.zju.edu.cn/openzjunet/zjumirrors.pgp | sudo apt-key add -
+curl https://mirrors.zju.edu.cn/openzjunet/zjunet.list | sudo tee /etc/apt/sources.list.d/zjunet.list
 sudo apt-get update
 sudo apt-get install zjunet
 ```
@@ -59,9 +59,9 @@ sudo apt-get install zjunet
 3. 依次输入并执行下列命令：
 
 ```bash
-curl https://dl.zjuqsc.com/linux/qsc.public.key | sudo tee /etc/pki/rpm-gpg/RPM-GPG-KEY-QSC-COMP66
-curl https://dl.zjuqsc.com/linux/yum/qsc.repo | sudo tee /etc/yum.repos.d/qsc.repo
-sudo rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-QSC-COMP66
+curl https://mirrors.zju.edu.cn/openzjunet/zjumirrors.pgp | sudo tee /etc/pki/rpm-gpg/RPM-GPG-KEY-ZJUMIRRORS
+curl https://mirrors.zju.edu.cn/openzjunet/zjunet.repo | sudo tee /etc/yum.repos.d/zjunet.repo
+sudo rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-ZJUMIRRORS
 sudo yum install zjunet
 ```
 

VERSION

@@ -1 +1 @@
-0.3.3-4
+0.3.3-5

build/build-pkgbuild.sh

@@ -17,7 +17,7 @@ FILE_SHA1=$(sha1sum $PKGNAME-$PKGVER.tar.gz | cut -f1 -d' ')
 FILE_SHA256=$(sha256sum $PKGNAME-$PKGVER.tar.gz | cut -f1 -d' ')
 
 cat > PKGBUILD <<EOF
-# Maintainer: Wu Yufei <me@tespent.cn>
+# Maintainer: Azuk 443 <me@azuk.top>
 
 pkgname=$PKGNAME
 pkgver=$PKGVER_NOREL

build/debian/build.sh

@@ -37,8 +37,8 @@ Section: net
 Priority: optional
 Architecture: all
 Depends: xl2tpd (>= 1.3.7), curl, dnsutils
-Maintainer: Tespent <me@tespent.cn>
-Description: Command Line Scripts for ZJU
+Maintainer: Azuk 443 <me@azuk.top>
+Description: Command Line Scripts for ZJU Campus Network
  This script provides a VPN / WLAN / NEXTHOP for ZJUer.
 EOF
 

build/openwrt/build.sh

@@ -27,8 +27,8 @@ Section: net
 Priority: optional
 Architecture: all
 Depends: xl2tpd (>= 1.3.7), curl, bind-dig
-Maintainer: Tespent <me@tespent.cn>
-Description: Command Line Scripts for ZJU
+Maintainer: Azuk 443 <me@azuk.top>
+Description: Command Line Scripts for ZJU Campus Network
  This script provides a VPN / WLAN / NEXTHOP for ZJUer.
 EOF
 

build/rpm/build_spec.sh

@@ -12,7 +12,7 @@ echo "License: GPL" >> zjunet.spec
 echo "Group: Applications/Internet" >> zjunet.spec
 echo "URL: https://github.com/QSCTech/zjunet/" >> zjunet.spec
 echo "Vendor: Qiu Shi Chao Website of Zhejiang University" >> zjunet.spec
-echo "Packager: Tespent <me@tespent.cn>" >> zjunet.spec
+echo "Packager: Azuk 443 <me@azuk.top>" >> zjunet.spec
 echo "Requires: xl2tpd >= 1.3.7, curl, bind-utils" >> zjunet.spec
 echo "BuildRoot:  %{_builddir}/%{name}-root" >> zjunet.spec
 echo "Source: %{name}-%{version}.tar.gz" >> zjunet.spec
@@ -41,14 +41,10 @@ for f in *.sh; do
 done
 cd ..
 echo 'install -m 644 VERSION $RPM_BUILD_ROOT/usr/share/zjunet/VERSION' >> zjunet.spec
-echo 'install -m 644 qsc.public.key $RPM_BUILD_ROOT/usr/share/zjunet/qsc.public.key' >> zjunet.spec
-echo 'install -m 644 qsc.repo $RPM_BUILD_ROOT/usr/share/zjunet/qsc.repo' >> zjunet.spec
 echo "" >> zjunet.spec
 echo "%files" >> zjunet.spec
 echo "%defattr(-,root,root)" >> zjunet.spec
 echo "/usr/bin/zjunet" >> zjunet.spec
-echo "/usr/share/zjunet/qsc.public.key" >> zjunet.spec
-echo "/usr/share/zjunet/qsc.repo" >> zjunet.spec
 echo "/usr/share/zjunet/zjunet-postinst" >> zjunet.spec
 echo "/usr/share/zjunet/VERSION" >> zjunet.spec
 cd lib

miscellaneous/qsc.list

@@ -1,3 +0,0 @@
-
-deb http://dl.zjuqsc.com/linux/debian stable main
-

miscellaneous/qsc.public.key

@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-mQENBFTWIjMBCADxVTzmEp6T7pT5MiOwcyNQ/AxWf2xsA2ZDugrNrS3GoWRVyowv
-phmgbq7J394cuL/Yw3f03Mw5mmDDEmC6j+FBf63hlLNj/UOeJdCibOSWJd89gbDY
-ETUDtWAU+6xlG8gcoi/Jedy+yXwjcD8P8r3xU9pGt6sbJbSUJBzX9ghtEPdygUnn
-rFG7jHXcbgnCr/mXcCMD59Y0grQvSW6N9B2vyGSrvYU4wlsBAtfJ93PJsd1bG5Oh
-NS0XOCr4HHZO8hXlSdY2wyce3E2Pk+i/tbRJXoaezsRnHnFO0vAIvyouuIZnu5fr
-iLIAWlRrErN09UKX4tlcmgWF1NRel3catpT/ABEBAAG0J1FpdSBTaGkgQ2hhbyAo
-Q09NUDY2KSA8dGVjaEB6anVxc2MuY29tPokBOAQTAQIAIgUCVNYiMwIbAwYLCQgH
-AwIGFQgCCQoLBBYCAwECHgECF4AACgkQ0qefnxdfAgJfKQgAmtjOp88qBHuguQrb
-oefHGqs9C/GyJR8uzmlyf2Csln8C1rWJvSuS6J+CDY0jppeHjVJJsNki1RFfIb6p
-8kFADGHwNMO3xdsMOxUyO9982pt1D0IdnQtn3lg7aWXwWTkdbXeDhOi2eh7BWINd
-TkYFP6lSanVi2yQEePhAdUv/sNQ2afKmjY+07CRNyCKgBXPPuh2VdWYjKk17Lx2G
-Jq/Jnw140hE9ESosrqefSnJRlZxjy4h4sE5sl8VPhkYxw91Ol9P9IyfIUx1uPzGc
-eZAj/nnGNaBjjDzMlsOKVkLptEX4XYmiKVhVby1NkWbO/Makj746lC9TCjVAUgrA
-Pw4mJLkBDQRU1iIzAQgApukqhnyFmOMvWTSin7NUf3nwNukkKwmABj9b54x+4XcO
-c6A/9P4GygpqEGyMN6uduxM7PoUA2sPJG2kh2+uZeEoavAGyqfPp2uCFy1SEqopA
-NyhWJz6bNkTUuHF2V1Wwfm/YIVIvaNKFz1be0t0YZkESuE1KvvEcoUa7BmhHiy7B
-MiWrom6lFSSprI9t46zeNm9aSWNYAgEtAqgDLkmdmrKUymsIQWTJiSbJV6A3B2FP
-+euiOozZmLq8bZDI1UgW1aieq0XTpz5ka/uklBKZKe98XmZUTeYmq/Y2xAm9CgJz
-OXEHgbOJ8bc1r5VnVg2xT2hVA6adw8SI/14tYpntZQARAQABiQEfBBgBAgAJBQJU
-1iIzAhsMAAoJENKnn58XXwICrWoH/RMEWSnAIYOp8oF4O5N3DT489iTkjZLezdAN
-ASZwU/AmkFf7HwWiwJ9l9aBVJkbjtmKDNTlBB/dfSyWTZZPER28+d5tAEQp5kr1b
-n5fm8+A+KHtIN2XclNMS84OpxWJ0RK2bwdc9PAe6iJwKXFTwLIVxUHYdUwLHRluH
-mpSnQGGoBpEh2711IhBofy/0JXikAi0KqeKia0EHZH4ZrWq5nIygCnVeVfa+SaHw
-ltjO2awKG1nJB+xjPTRa+lu84qmczrOQ6rKkILUXdHTBaS10rHQbHCa9x8GSIFVs
-HExKX5SwV9uwcmHN6WVW8zISWZT9qVcvLOcf1cYRWxAHzxKCy0Y=
-=dTq1
------END PGP PUBLIC KEY BLOCK-----

miscellaneous/qsc.repo

@@ -1,9 +0,0 @@
-[qsc]
-name=Several things for Qiu Shi Chao Website
-baseurl=http://dl.zjuqsc.com/linux/yum
-failovermethod=priority
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-QSC-COMP66
-metadata_expire=30m
-

miscellaneous/zjunet-postinst

@@ -1,20 +1,5 @@
 #!/bin/sh
 
-command -v apt-key 2>&1 >/dev/null && [ -d /etc/apt ] && {
-	cp /usr/share/zjunet/qsc.list /etc/apt/sources.list.d/qsc.list
-	chmod 644 /etc/apt/sources.list.d/qsc.list
-	apt-key add /usr/share/zjunet/qsc.public.key 2>&1 >/dev/null || true
-	echo "Added apt list."
-}
-
-command -v rpm 2>&1 >/dev/null && [ -d /etc/pki/rpm-gpg ] && [ -d /etc/yum.repos.d ] && {
-	cp /usr/share/zjunet/qsc.public.key /etc/pki/rpm-gpg/RPM-GPG-KEY-QSC-COMP66
-	chmod 644 /etc/pki/rpm-gpg/RPM-GPG-KEY-QSC-COMP66
-	rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-QSC-COMP66 2>&1 >/dev/null || true
-	cp /usr/share/zjunet/qsc.repo /etc/yum.repos.d/qsc.repo || true
-	echo "Added yum repo."
-}
-
 cat <<BANNER
 ----------------------------------------------------------------------