fix(firefly): set Data Importer APP_URL for subdirectory install

Configure APP_URL and ASSET_URL during install so redirects (e.g. Start Over) resolve to /dataimporter/ instead of the server root.

Fixes #14830

Co-authored-by: Cursor <cursoragent@cursor.com>

ct/fireshare.sh

@@ -53,12 +53,6 @@ function update_script() {
     export VIDEO_DIRECTORY=/opt/fireshare-videos
     export PROCESSED_DIRECTORY=/opt/fireshare-processed
     $STD uv run flask db upgrade
-
-    msg_info "Building Fireshare Client"
-    cd /opt/fireshare/app/client
-    $STD npm install
-    $STD npm run build
-    msg_ok "Built Fireshare Client"
     msg_ok "Updated Fireshare"
 
     msg_info "Starting Service"

ct/odoo.sh

@@ -20,22 +20,6 @@ variables
 color
 catch_errors
 
-ensure_lxml_html_clean() {
-  ensure_dependencies python3-lxml
-  if apt-cache show python3-lxml-html-clean &>/dev/null; then
-    ensure_dependencies python3-lxml-html-clean
-  else
-    curl -fsSL "http://archive.ubuntu.com/ubuntu/pool/universe/l/lxml-html-clean/python3-lxml-html-clean_0.1.1-1_all.deb" -o /opt/python3-lxml-html-clean.deb
-    $STD dpkg -i /opt/python3-lxml-html-clean.deb
-    $STD apt-get install -f -y
-    rm -f /opt/python3-lxml-html-clean.deb
-  fi
-  if ! python3 -c "import lxml_html_clean; from lxml.html import clean" 2>/dev/null; then
-    msg_error "lxml.html.clean is not available (python3-lxml-html-clean required)"
-    exit 1
-  fi
-}
-
 function update_script() {
   header_info
   check_container_storage
@@ -45,7 +29,12 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  ensure_lxml_html_clean
+  ensure_dependencies python3-lxml
+  if ! [[ $(dpkg -s python3-lxml-html-clean 2>/dev/null) ]]; then
+    curl -fsSL "http://archive.ubuntu.com/ubuntu/pool/universe/l/lxml-html-clean/python3-lxml-html-clean_0.1.1-1_all.deb" -o /opt/python3-lxml-html-clean.deb
+    $STD dpkg -i /opt/python3-lxml-html-clean.deb
+    rm -f /opt/python3-lxml-html-clean.deb
+  fi
 
   RELEASE=$(curl -fsSL https://nightly.odoo.com/ | grep -oE 'href="[0-9]+\.[0-9]+/nightly"' | head -n1 | cut -d'"' -f2 | cut -d/ -f1)
   LATEST_VERSION=$(curl -fsSL "https://nightly.odoo.com/${RELEASE}/nightly/deb/" |
@@ -62,7 +51,6 @@ function update_script() {
     msg_info "Updating ${APP} to ${LATEST_VERSION}"
     curl -fsSL https://nightly.odoo.com/${RELEASE}/nightly/deb/odoo_${RELEASE}.latest_all.deb -o /opt/odoo.deb
     $STD apt install -y /opt/odoo.deb
-    ensure_lxml_html_clean
     rm -f /opt/odoo.deb
     echo "$LATEST_VERSION" >/opt/${APP}_version.txt
     msg_ok "Updated ${APP} to ${LATEST_VERSION}"

install/firefly-install.sh

@@ -37,7 +37,13 @@ msg_ok "Configured Firefly III"
 
 msg_info "Configuring Data Importer"
 cp /opt/firefly/dataimporter/.env.example /opt/firefly/dataimporter/.env
-sed -i "s#FIREFLY_III_URL=#FIREFLY_III_URL=http://${LOCAL_IP}#g" /opt/firefly/dataimporter/.env
+sed -i \
+  -e "s#FIREFLY_III_URL=#FIREFLY_III_URL=http://${LOCAL_IP}#g" \
+  -e "s|^APP_URL=.*|APP_URL=http://${LOCAL_IP}/dataimporter|" \
+  -e "s|^ASSET_URL=.*|ASSET_URL=/dataimporter|" \
+  /opt/firefly/dataimporter/.env
+cd /opt/firefly/dataimporter
+$STD php artisan config:clear
 chown -R www-data:www-data /opt/firefly
 msg_ok "Configured Data Importer"
 

install/odoo-install.sh

@@ -13,25 +13,10 @@ setting_up_container
 network_check
 update_os
 
-ensure_lxml_html_clean() {
-  ensure_dependencies python3-lxml
-  if apt-cache show python3-lxml-html-clean &>/dev/null; then
-    ensure_dependencies python3-lxml-html-clean
-  else
-    curl -fsSL "http://archive.ubuntu.com/ubuntu/pool/universe/l/lxml-html-clean/python3-lxml-html-clean_0.1.1-1_all.deb" -o /opt/python3-lxml-html-clean.deb
-    $STD dpkg -i /opt/python3-lxml-html-clean.deb
-    $STD apt-get install -f -y
-    rm -f /opt/python3-lxml-html-clean.deb
-  fi
-  if ! python3 -c "import lxml_html_clean; from lxml.html import clean" 2>/dev/null; then
-    msg_error "lxml.html.clean is not available (python3-lxml-html-clean required)"
-    exit 1
-  fi
-}
-
 msg_info "Installing Dependencies"
-$STD apt install -y wkhtmltopdf
-ensure_lxml_html_clean
+$STD apt install -y python3-lxml wkhtmltopdf
+curl -fsSL "http://archive.ubuntu.com/ubuntu/pool/universe/l/lxml-html-clean/python3-lxml-html-clean_0.1.1-1_all.deb" -o /opt/python3-lxml-html-clean.deb
+$STD dpkg -i /opt/python3-lxml-html-clean.deb
 msg_ok "Installed Dependencies"
 
 PG_VERSION="18" setup_postgresql
@@ -46,7 +31,6 @@ LATEST_VERSION=$(curl -fsSL "https://nightly.odoo.com/${RELEASE}/nightly/deb/" |
 msg_info "Setup Odoo $RELEASE"
 curl -fsSL https://nightly.odoo.com/${RELEASE}/nightly/deb/odoo_${RELEASE}.latest_all.deb -o /opt/odoo.deb
 $STD apt install -y /opt/odoo.deb
-ensure_lxml_html_clean
 msg_ok "Setup Odoo $RELEASE"
 
 msg_info "Setup PostgreSQL Database"
@@ -75,6 +59,7 @@ sed -i \
   /etc/odoo/odoo.conf
 $STD sudo -u odoo odoo -c /etc/odoo/odoo.conf -d odoo -i base --stop-after-init
 rm -f /opt/odoo.deb
+rm -f /opt/python3-lxml-html-clean.deb
 echo "${LATEST_VERSION}" >/opt/${APPLICATION}_version.txt
 msg_ok "Configured Odoo"