From 46d23a0d5d5d2b86995b1546477a7db0a9a6573e Mon Sep 17 00:00:00 2001 From: Daniel Markstedt Date: Mon, 14 Feb 2022 15:30:33 -0800 Subject: [PATCH] Proper cleanup of old python protobuf libraries. (#667) --- easyinstall.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/easyinstall.sh b/easyinstall.sh index 95d398e8..6bfa87ca 100755 --- a/easyinstall.sh +++ b/easyinstall.sh @@ -113,9 +113,17 @@ function installRaScsi() { } function preparePythonCommon() { - if [ -f "$PYTHON_COMMON_PATH/rascsi_interface_pb2.py" ]; then - sudo rm "$PYTHON_COMMON_PATH/rascsi_interface_pb2.py" - echo "Deleting old Python protobuf library rascsi_interface_pb2.py" + if [ -f "$WEB_INSTALL_PATH/src/rascsi_interface_pb2.py" ]; then + sudo rm "$WEB_INSTALL_PATH/src/rascsi_interface_pb2.py" + echo "Deleting old Python protobuf library $WEB_INSTALL_PATH/src/rascsi_interface_pb2.py" + fi + if [ -f "$OLED_INSTALL_PATH/src/rascsi_interface_pb2.py" ]; then + sudo rm "$OLED_INSTALL_PATH/src/rascsi_interface_pb2.py" + echo "Deleting old Python protobuf library $OLED_INSTALL_PATH/src/rascsi_interface_pb2.py" + fi + if [ -f "$PYTHON_COMMON_PATH/src/rascsi_interface_pb2.py" ]; then + sudo rm "$PYTHON_COMMON_PATH/src/rascsi_interface_pb2.py" + echo "Deleting old Python protobuf library $PYTHON_COMMON_PATH/src/rascsi_interface_pb2.py" fi echo "Compiling the Python protobuf library rascsi_interface_pb2.py..." protoc -I="$BASE/src/raspberrypi/" --python_out="$PYTHON_COMMON_PATH/src" rascsi_interface.proto