Skip to content

Commit 44328b7

Browse files
committed
Ensure compatible psutil version for #69
1 parent 6b81901 commit 44328b7

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

examples/install-service.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ NOBUTTON="no"
1212
BRIGHTNESS=255
1313
PYTHON="python3"
1414
PIP="pip3"
15+
PSUTIL_MIN_VERSION="5.6.7"
1516

1617
ON_THRESHOLD_SET=false
1718
OFF_THRESHOLD_SET=false
@@ -201,7 +202,7 @@ Restart=on-failure
201202
WantedBy=multi-user.target
202203
EOF
203204

204-
printf "Checking for rpi.gpio>=0.7.0 (for Pi 4 support)\n"
205+
printf "Checking for rpi.gpio >= 0.7.0 (for Pi 4 support)\n"
205206
$PYTHON - <<EOF
206207
import RPi.GPIO as GPIO
207208
from pkg_resources import parse_version
@@ -229,16 +230,19 @@ else
229230
printf "Fan SHIM already installed\n"
230231
fi
231232

232-
printf "Checking for psutil\n"
233+
printf "Checking for psutil >= $PSUTIL_MIN_VERSION\n"
233234
$PYTHON - > /dev/null 2>&1 <<EOF
235+
import sys
234236
import psutil
237+
from pkg_resources import parse_version
238+
sys.exit(not parse_version(psutil.__version__) >= parse_version('$PSUTIL_MIN_VERSION'))
235239
EOF
236240

237241
if [ $? -ne 0 ]; then
238242
printf "Installing psutil\n"
239-
$PIP install psutil fanshim
243+
$PIP install --ignore-installed psutil
240244
else
241-
printf "psutil already installed\n"
245+
printf "psutil >= $PSUTIL_MIN_VERSION already installed\n"
242246
fi
243247

244248
printf "\nInstalling service to: $SERVICE_PATH\n"

0 commit comments

Comments
 (0)