Skip to content

Commit 68aa481

Browse files
committed
psutil library only need to be installed in powershell env
1 parent b29b68d commit 68aa481

File tree

4 files changed

+3
-8
lines changed

4 files changed

+3
-8
lines changed

cmds/cmd_menuconfig.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
import os
2929
import platform
3030
import re
31-
import psutil
3231
from vars import Import
3332
from .cmd_package.cmd_package_utils import find_bool_macro_in_config, find_IAR_EXEC_PATH, find_MDK_EXEC_PATH
3433

3534
def is_in_powershell():
3635
rst = False
3736
try:
37+
import psutil
3838
rst = bool(re.fullmatch('pwsh|pwsh.exe|powershell.exe', psutil.Process(os.getppid()).name()))
3939
except:
4040
pass

install_macos.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@ if ! [[ `$RTT_PYTHON -m pip list | grep requests` ]]; then
5151
$RTT_PYTHON -m pip install requests
5252
fi
5353

54-
if ! [[ `$RTT_PYTHON -m pip list | grep psutil` ]]; then
55-
echo "Installing psutil."
56-
$RTT_PYTHON -m pip install psutil
57-
fi
58-
5954
if ! [ -x "$(command -v arm-none-eabi-gcc)" ]; then
6055
echo "Installing GNU Arm Embedded Toolchain."
6156
brew install gnu-arm-embedded

install_suse.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
sudo zypper update -y
44

55
sudo zypper install python3 python3-pip gcc git ncurses-devel cross-arm-none-gcc11-bootstrap cross-arm-binutils qemu qemu-arm qemu-extra -y
6-
python3 -m pip install scons==4.4.0 requests psutil
6+
python3 -m pip install scons==4.4.0 requests
77
python3 -m pip install -U pyocd
88

99
url=https://raw.githubusercontent.com/RT-Thread/env/master/touch_env.sh

install_ubuntu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ sudo apt update
44
sudo apt upgrade -y
55

66
sudo apt install python3 python3-pip gcc git libncurses5-dev gcc-arm-none-eabi binutils-arm-none-eabi gdb-multiarch qemu qemu-system-arm -y
7-
python3 -m pip install scons==4.4.0 requests psutil
7+
python3 -m pip install scons==4.4.0 requests
88
python3 -m pip install -U pyocd
99

1010
url=https://raw.githubusercontent.com/RT-Thread/env/master/touch_env.sh

0 commit comments

Comments
 (0)