Skip to content

Commit

Permalink
v1.0.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
enfein committed Nov 30, 2021
1 parent c7e0b86 commit 3139aef
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 28 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@
*.so
*.dylib
*.deb

/TODO.md
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ mieru 代理软件由称为 mieru【見える】的客户端软件和称为 mita
**【1】下载 mita 安装包**

```sh
curl -L -O https://github.com/enfein/mieru/releases/download/v1.0.0/mita_1.0.0_amd64.deb
curl -L -O https://github.com/enfein/mieru/releases/download/v1.0.1/mita_1.0.1_amd64.deb
```

**【2】安装 mita 软件包**

```sh
sudo dpkg -i mita_1.0.0_amd64.deb
sudo dpkg -i mita_1.0.1_amd64.deb
```

**【3】赋予当前用户操作 mita 的权限,需要重启服务器使此设置生效**
Expand Down Expand Up @@ -197,17 +197,17 @@ mieru 客户端软件支持 Windows,Mac OS 和 Linux 系统。用户可以在

```powershell
# Windows PowerShell
Invoke-WebRequest https://github.com/enfein/mieru/releases/download/v1.0.0/mieru_1.0.0_windows_amd64.zip -OutFile mieru_1.0.0_windows_amd64.zip
Invoke-WebRequest https://github.com/enfein/mieru/releases/download/v1.0.1/mieru_1.0.1_windows_amd64.zip -OutFile mieru_1.0.1_windows_amd64.zip
```

```sh
# Mac OS
curl -L -O https://github.com/enfein/mieru/releases/download/v1.0.0/mieru_1.0.0_darwin_amd64.tar.gz
curl -L -O https://github.com/enfein/mieru/releases/download/v1.0.1/mieru_1.0.1_darwin_amd64.tar.gz
```

```sh
# Linux
curl -L -O https://github.com/enfein/mieru/releases/download/v1.0.0/mieru_1.0.0_linux_amd64.tar.gz
curl -L -O https://github.com/enfein/mieru/releases/download/v1.0.1/mieru_1.0.1_linux_amd64.tar.gz
```

解压缩之后,就可以得到可执行文件 `mieru``mieru.exe`
Expand All @@ -217,9 +217,9 @@ curl -L -O https://github.com/enfein/mieru/releases/download/v1.0.0/mieru_1.0.0_
如果你的客户端操作系统是 Debian/Ubuntu 系列 Linux 发行版,可以使用下面的指令下载和安装 mieru。

```sh
curl -L -O https://github.com/enfein/mieru/releases/download/v1.0.0/mieru_1.0.0_amd64.deb
curl -L -O https://github.com/enfein/mieru/releases/download/v1.0.1/mieru_1.0.1_amd64.deb

sudo dpkg -i mieru_1.0.0_amd64.deb
sudo dpkg -i mieru_1.0.1_amd64.deb
```

**【可选】将 mieru 可执行文件移动或添加至系统路径 PATH**
Expand Down
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ has_command() {
# If this version is changed, also change the version in
# - build/package/mieru/debian/DEBIAN/control
# - build/package/mita/debian/DEBIAN/control
# Any reference in README.md
version="1.0.0"
# - all references in README.md
version="1.0.1"

set -e

Expand Down
2 changes: 1 addition & 1 deletion build/package/mieru/debian/DEBIAN/control
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: mieru
Version: 1.0.0
Version: 1.0.1
Section: net
Priority: optional
Architecture: amd64
Expand Down
2 changes: 1 addition & 1 deletion build/package/mita/debian/DEBIAN/control
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: mita
Version: 1.0.0
Version: 1.0.1
Section: net
Priority: optional
Architecture: amd64
Expand Down
10 changes: 8 additions & 2 deletions build/package/mita/debian/DEBIAN/postinst
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
#!/bin/sh
set -e

/usr/sbin/useradd --no-create-home --user-group mita
/usr/bin/id mita > /dev/null 2>&1
rc=$?
if [ $rc -ne 0 ]; then
/usr/sbin/useradd --no-create-home --user-group mita
fi

set -e

mkdir -p /etc/mita
chmod 775 /etc/mita
Expand All @@ -10,3 +15,4 @@ systemctl daemon-reload

# Server daemon will run with the system.
systemctl enable mita.service
systemctl start mita.service
3 changes: 3 additions & 0 deletions build/package/mita/debian/DEBIAN/postrm
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh

systemctl daemon-reload
15 changes: 0 additions & 15 deletions build/package/mita/debian/DEBIAN/prerm
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,3 @@
set -e

systemctl stop mita.service

rm -rf /etc/mita

# Remove all the other members in "mita" group.
members=$(awk -F':' '/mita/{print $4}' /etc/group)
n=$(echo "$members" | awk -F',' '{print NF-1}')
n=$(( n + 1 ))
i=1
while [ $i -le $n ]; do
user=$(echo "$members" | cut -d',' -f $i)
gpasswd --delete $user mita
i=$(( i + 1 ))
done

/usr/sbin/userdel mita

0 comments on commit 3139aef

Please sign in to comment.