diff --git a/ct/odoo.sh b/ct/odoo.sh index 5690a3a14..f02a17dcc 100644 --- a/ct/odoo.sh +++ b/ct/odoo.sh @@ -13,7 +13,7 @@ var_disk="${var_disk:-6}" var_cpu="${var_cpu:-2}" var_ram="${var_ram:-2048}" var_os="${var_os:-debian}" -var_version="${var_version:-12}" +var_version="${var_version:-13}" var_arm64="${var_arm64:-yes}" var_unprivileged="${var_unprivileged:-1}" @@ -45,7 +45,7 @@ function update_script() { systemctl start odoo fi - RELEASE=$(curl -fsSL https://nightly.odoo.com/ | grep -oE 'href="[0-9]+\.[0-9]+/nightly"' | head -n1 | cut -d'"' -f2 | cut -d/ -f1) + RELEASE=$(dpkg-query -W -f='${Version}' odoo | grep -oE '^[0-9]+\.[0-9]+') LATEST_VERSION=$(curl -fsSL "https://nightly.odoo.com/${RELEASE}/nightly/deb/" | grep -oP "odoo_${RELEASE}\.\d+_all\.deb" | sed -E "s/odoo_(${RELEASE}\.[0-9]+)_all\.deb/\1/" | diff --git a/install/odoo-install.sh b/install/odoo-install.sh index 621084483..0f5058f72 100644 --- a/install/odoo-install.sh +++ b/install/odoo-install.sh @@ -13,12 +13,6 @@ setting_up_container network_check update_os -msg_info "Installing Dependencies" -$STD apt install -y python3-lxml -curl -fsSL --proto '=https' "https://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" - fetch_and_deploy_gh_release "wkhtmltopdf" "wkhtmltopdf/packaging" "binary" "latest" "" "wkhtmltox_*.bookworm_$(arch_resolve).deb" PG_VERSION="18" setup_postgresql @@ -61,7 +55,6 @@ 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"