diff --git a/hblink3-docker-install.sh b/hblink3-docker-install.sh index 2818541..5b5ba01 100755 --- a/hblink3-docker-install.sh +++ b/hblink3-docker-install.sh @@ -262,38 +262,38 @@ pip_install() { fi } - echo "Installing Python dependencies..." - cd $HBMONDIR - - # Install setuptools and wheel first - if ! pip_install setuptools wheel; then - echo "ERROR: Failed to install setuptools and wheel" - echo "Please check your internet connection and Python installation" - exit 1 - fi - - # Check if requirements.txt exists before trying to install - if [ -f requirements.txt ]; then - if ! pip_install -r requirements.txt; then - echo "ERROR: Failed to install packages from requirements.txt" - echo "This may be due to network issues or missing system dependencies" - exit 1 - fi - else - echo "WARNING: requirements.txt not found in $HBMONDIR" - echo "Continuing installation without requirements.txt dependencies..." - fi - - # Install attrs with --force flag (note: --force is deprecated, using --force-reinstall) - if ! pip_install attrs --force-reinstall; then - echo "WARNING: Failed to install attrs with --force-reinstall, trying without force..." - if ! pip_install attrs; then - echo "ERROR: Failed to install attrs package" - exit 1 - fi - fi - - echo Install /opt/HBMonv2/config.py ... +echo "Installing Python dependencies..." +cd $HBMONDIR + +# Install setuptools and wheel first +if ! pip_install setuptools wheel; then + echo "ERROR: Failed to install setuptools and wheel" + echo "Please check your internet connection and Python installation" + exit 1 +fi + +# Check if requirements.txt exists before trying to install +if [ -f requirements.txt ]; then + if ! pip_install -r requirements.txt; then + echo "ERROR: Failed to install packages from requirements.txt" + echo "This may be due to network issues or missing system dependencies" + exit 1 + fi +else + echo "WARNING: requirements.txt not found in $HBMONDIR" + echo "Continuing installation without requirements.txt dependencies..." +fi + +# Install attrs with --force flag (note: --force is deprecated, using --force-reinstall) +if ! pip_install attrs --force-reinstall; then + echo "WARNING: Failed to install attrs with --force-reinstall, trying without force..." + if ! pip_install attrs; then + echo "ERROR: Failed to install attrs package" + exit 1 + fi +fi + +echo Install /opt/HBMonv2/config.py ... cat << EOF > /opt/HBMonv2/config.py ############################################################################### # HBMonv2 Configuration File Example