NexByteSystems/hblink3-docker-install
1
0
Fork 0
mirror of https://github.com/ShaYmez/hblink3-docker-install.git synced 2025-12-22 21:49:50 +13:00
Code Issues Packages Projects Releases Wiki Activity

Improve error handling and robustness based on second code review

Browse Source 
Co-authored-by: ShaYmez <76499782+ShaYmez@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2025-12-13 22:13:06 +00:00
parent 4fa32f6fc4
commit 626e500ef0
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hblink3-docker-install.sh
View File

@ -274,20 +274,17 @@ if [ $VERSION -ge 12 ]; then
# Create virtual environment # Create virtual environment
if [ ! -d "$HBMONDIR/venv" ]; then if [ ! -d "$HBMONDIR/venv" ]; then
python3 -m venv "$HBMONDIR/venv" python3 -m venv "$HBMONDIR/venv" || { echo "ERROR: Failed to create virtual environment"; exit 1; }
if [ $? -ne 0 ]; then
echo "ERROR: Failed to create virtual environment"
exit 1
fi
echo "Virtual environment created successfully at $HBMONDIR/venv" echo "Virtual environment created successfully at $HBMONDIR/venv"
else else
echo "Virtual environment already exists at $HBMONDIR/venv" echo "Virtual environment already exists at $HBMONDIR/venv"
fi fi
# Activate virtual environment # Activate virtual environment
source "$HBMONDIR/venv/bin/activate" source "$HBMONDIR/venv/bin/activate" || { echo "ERROR: Failed to activate virtual environment"; exit 1; }
if [ $? -ne 0 ]; then # Verify activation by checking VIRTUAL_ENV is set
echo "ERROR: Failed to activate virtual environment" if [ -z "$VIRTUAL_ENV" ]; then
echo "ERROR: Virtual environment activation failed - VIRTUAL_ENV not set"
exit 1 exit 1
fi fi
echo "Virtual environment activated" echo "Virtual environment activated"
@ -382,9 +379,17 @@ EOF
echo "Updating hbmon.service to use virtual environment..." echo "Updating hbmon.service to use virtual environment..."
# Update ExecStart to use venv Python (only if not already using venv) # Update ExecStart to use venv Python (only if not already using venv)
if ! grep -q "$HBMONDIR/venv/bin/python3" /lib/systemd/system/hbmon.service; then if ! grep -q "$HBMONDIR/venv/bin/python3" /lib/systemd/system/hbmon.service; then
# Replace common Python interpreter paths with venv path
sed -i "s|ExecStart=/usr/bin/python3|ExecStart=$HBMONDIR/venv/bin/python3|g" /lib/systemd/system/hbmon.service sed -i "s|ExecStart=/usr/bin/python3|ExecStart=$HBMONDIR/venv/bin/python3|g" /lib/systemd/system/hbmon.service
sed -i "s|ExecStart=python3 |ExecStart=$HBMONDIR/venv/bin/python3 |g" /lib/systemd/system/hbmon.service sed -i "s|ExecStart=python3 |ExecStart=$HBMONDIR/venv/bin/python3 |g" /lib/systemd/system/hbmon.service
# Verify the service file was updated correctly
if grep -q "ExecStart=$HBMONDIR/venv/bin/python3" /lib/systemd/system/hbmon.service; then
echo "Service file updated to use virtual environment" echo "Service file updated to use virtual environment"
else
echo "WARNING: Service file update may not have completed correctly"
echo "Please manually verify /lib/systemd/system/hbmon.service uses $HBMONDIR/venv/bin/python3"
fi
else else
echo "Service file already configured to use virtual environment" echo "Service file already configured to use virtual environment"
fi fi