Fix jpegio build directory handling
- Use fixed path instead of mktemp - Remove dir before clone to ensure clean state - chown to user before pip install - Check clone success before proceeding 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -292,16 +292,22 @@ if [ -n "$STEGASOO_DIR" ] && [ -d "$STEGASOO_DIR/venv" ]; then
|
|||||||
echo " Building jpegio for ARM64 (this may take a minute)..."
|
echo " Building jpegio for ARM64 (this may take a minute)..."
|
||||||
# Install build deps
|
# Install build deps
|
||||||
sudo -u "$STEGASOO_USER" "$STEGASOO_DIR/venv/bin/pip" install --quiet cython numpy
|
sudo -u "$STEGASOO_USER" "$STEGASOO_DIR/venv/bin/pip" install --quiet cython numpy
|
||||||
JPEGIO_DIR=$(mktemp -d)
|
JPEGIO_DIR="/tmp/jpegio-build-$$"
|
||||||
git clone --quiet https://github.com/dwgoon/jpegio.git "$JPEGIO_DIR"
|
|
||||||
# Apply patch to remove -m64 flag
|
|
||||||
if [ -f "$STEGASOO_DIR/rpi/patches/jpegio/apply-patch.sh" ]; then
|
|
||||||
bash "$STEGASOO_DIR/rpi/patches/jpegio/apply-patch.sh" "$JPEGIO_DIR"
|
|
||||||
else
|
|
||||||
sed -i "s/cargs.append('-m64')/pass # ARM64 fix/g" "$JPEGIO_DIR/setup.py"
|
|
||||||
fi
|
|
||||||
sudo -u "$STEGASOO_USER" "$STEGASOO_DIR/venv/bin/pip" install --quiet "$JPEGIO_DIR"
|
|
||||||
rm -rf "$JPEGIO_DIR"
|
rm -rf "$JPEGIO_DIR"
|
||||||
|
if git clone https://github.com/dwgoon/jpegio.git "$JPEGIO_DIR" 2>/dev/null; then
|
||||||
|
# Apply patch to remove -m64 flag
|
||||||
|
if [ -f "$STEGASOO_DIR/rpi/patches/jpegio/apply-patch.sh" ]; then
|
||||||
|
bash "$STEGASOO_DIR/rpi/patches/jpegio/apply-patch.sh" "$JPEGIO_DIR"
|
||||||
|
else
|
||||||
|
sed -i "s/cargs.append('-m64')/pass # ARM64 fix/g" "$JPEGIO_DIR/setup.py"
|
||||||
|
fi
|
||||||
|
# Change ownership so user can build
|
||||||
|
chown -R "$STEGASOO_USER:$STEGASOO_USER" "$JPEGIO_DIR"
|
||||||
|
sudo -u "$STEGASOO_USER" "$STEGASOO_DIR/venv/bin/pip" install "$JPEGIO_DIR"
|
||||||
|
rm -rf "$JPEGIO_DIR"
|
||||||
|
else
|
||||||
|
echo " Warning: Failed to clone jpegio, DCT mode may not work"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sudo -u "$STEGASOO_USER" "$STEGASOO_DIR/venv/bin/pip" install --quiet -e "$STEGASOO_DIR[web]"
|
sudo -u "$STEGASOO_USER" "$STEGASOO_DIR/venv/bin/pip" install --quiet -e "$STEGASOO_DIR[web]"
|
||||||
|
|||||||
Reference in New Issue
Block a user