Skip to content

Commit

Permalink
Updated some dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
x committed Aug 3, 2020
1 parent 95675c5 commit 1c0613d
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions README-Chinese.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ bluescan 在底层基于 Linux 官方的 BlueZ 蓝牙协议栈。如下依赖的
sudo apt install libglib2.0-dev libbluetooth-dev
```

当在 Linux 虚拟机中使用该工具时,建议让虚拟机独占一个 USB 蓝牙适配器,比如售价 99 块的 [Ostran 奥视通 USB 蓝牙适配器 OST-105 CSR 8150 v4.0](https://item.taobao.com/item.htm?spm=a230r.1.14.14.21b6705fm5gjj3&id=38948169460&ns=1&abbucket=6#detail)。当然最好用的还是有点小贵的 [Parani UD100-G03](https://item.taobao.com/item.htm?spm=a230r.1.14.16.19bcf4b2koxeWN&id=561488544550&ns=1&abbucket=19#detail),560 元。如果你想尝试下漏洞扫描 (demo),请参考 [ojasookert/CVE-2017-0785](https://github.com/ojasookert/CVE-2017-0785)`README.md` 来解决依赖问题。
当在 Linux 虚拟机中使用该工具时,**建议让虚拟机独占一个 USB 蓝牙适配器**,比如售价 99 块的 [Ostran 奥视通 USB 蓝牙适配器 OST-105 CSR 8150 v4.0](https://item.taobao.com/item.htm?spm=a230r.1.14.14.21b6705fm5gjj3&id=38948169460&ns=1&abbucket=6#detail)。当然最好用的还是有点小贵的 [Parani UD100-G03](https://item.taobao.com/item.htm?spm=a230r.1.14.16.19bcf4b2koxeWN&id=561488544550&ns=1&abbucket=19#detail),560 元。如果你想尝试下漏洞扫描 (demo),请参考 [ojasookert/CVE-2017-0785](https://github.com/ojasookert/CVE-2017-0785)`README.md` 来解决依赖问题。

## 安装

Expand All @@ -35,7 +35,7 @@ sudo pip3 install bluescan

```txt
$ bluescan -h
bluescan v0.2.0
bluescan v0.2.1
A powerful Bluetooth scanner.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ This tool is based on BlueZ, the official Linux Bluetooth stack. The following p
sudo apt install libglib2.0-dev libbluetooth-dev
```

When you play this tool in a Linux virtual machine, making a USB Bluetooth adapter exclusive to it is recommended, like the [Ostran Bluetooth USB Adapter OST-105 CSR 8150 v4.0](https://item.taobao.com/item.htm?spm=a230r.1.14.14.21b6705fm5gjj3&id=38948169460&ns=1&abbucket=6#detail) for 99 RMB. Of course, the best one to use is the little bit expensive [Parani UD100-G03](https://item.taobao.com/item.htm?spm=a230r.1.14.16.19bcf4b2koxeWN&id=561488544550&ns=1&abbucket=19#detail), 560 RMB. And if you want to try the vulnerability scanning, see `README.md` of [ojasookert/CVE-2017-0785](https://github.com/ojasookert/CVE-2017-0785).
When you play this tool in a Linux virtual machine, **making a USB Bluetooth adapter exclusive to it is recommended**, like the [Ostran Bluetooth USB Adapter OST-105 CSR 8150 v4.0](https://item.taobao.com/item.htm?spm=a230r.1.14.14.21b6705fm5gjj3&id=38948169460&ns=1&abbucket=6#detail) for 99 RMB. Of course, the best one to use is the little bit expensive [Parani UD100-G03](https://item.taobao.com/item.htm?spm=a230r.1.14.16.19bcf4b2koxeWN&id=561488544550&ns=1&abbucket=19#detail), 560 RMB. And if you want to try the vulnerability scanning, see `README.md` of [ojasookert/CVE-2017-0785](https://github.com/ojasookert/CVE-2017-0785).

## Install

Expand All @@ -37,7 +37,7 @@ sudo pip3 install bluescan

```txt
$ bluescan -h
bluescan v0.2.0
bluescan v0.2.1
A powerful Bluetooth scanner.
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def run(self):
if __name__ == '__main__':
setup(
name='bluescan',
version='0.2.0',
version='0.2.1',
license = "GPL-3.0",
packages=find_packages('src'), # include all packages under src
package_dir={'':'src'}, # tell distutils packages are under src
Expand All @@ -56,7 +56,7 @@ def run(self):
#scripts=['src/bluescan/bluescan.py'],

install_requires=[
'bthci>=0.0.2', 'pyclui>=0.0.2',
'bthci>=0.0.3', 'pyclui>=0.0.2',
'pybluez>=0.23', 'bluepy>=1.3.0', 'docopt>=0.6.2'
],

Expand Down
1 change: 0 additions & 1 deletion src/bluescan/le_scan.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

from bluepy.btle import Scanner
from bluepy.btle import DefaultDelegate
from termcolor import cprint

from pyclui import blue, green, yellow, red, \
DEBUG, INFO, WARNING, ERROR
Expand Down
4 changes: 2 additions & 2 deletions src/bluescan/ui.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3

r'''bluescan v0.2.0
r'''bluescan v0.2.1
A powerful Bluetooth scanner.
Expand Down Expand Up @@ -42,7 +42,7 @@


def parse_cmdline() -> dict:
args = docopt(__doc__, version='v0.2.0', options_first=True)
args = docopt(__doc__, version='v0.2.1', options_first=True)
#print("[Debug] args =", args)

args['-m'] = args['-m'].lower()
Expand Down

0 comments on commit 1c0613d

Please sign in to comment.