diff --git a/ct/shelfmark.sh b/ct/shelfmark.sh index 4a0756373..1fac461cc 100644 --- a/ct/shelfmark.sh +++ b/ct/shelfmark.sh @@ -30,7 +30,7 @@ function update_script() { fi NODE_VERSION="24" setup_nodejs - PYTHON_VERSION="3.12" setup_uv + PYTHON_VERSION="3.14" setup_uv if check_for_gh_release "shelfmark" "calibrain/shelfmark"; then msg_info "Stopping Service(s)" @@ -59,6 +59,7 @@ function update_script() { RELEASE_VERSION=$(cat "$HOME/.shelfmark") msg_info "Updating Shelfmark" + export VIRTUAL_ENV=/opt/shelfmark/venv sed -i "s/^RELEASE_VERSION=.*/RELEASE_VERSION=$RELEASE_VERSION/" /etc/shelfmark/.env cd /opt/shelfmark/src/frontend $STD npm ci @@ -67,9 +68,10 @@ function update_script() { cd /opt/shelfmark $STD uv venv -c ./venv $STD source ./venv/bin/activate - $STD uv pip install -r ./requirements-base.txt if [[ $(sed -n '/_BYPASS=/s/[^=]*=//p' /etc/shelfmark/.env) == "true" ]] && [[ $(sed -n '/BYPASSER=/s/[^=]*=//p' /etc/shelfmark/.env) == "false" ]]; then - $STD uv pip install -r ./requirements-shelfmark.txt + $STD uv sync --active --locked --no-default-groups --extra browser + else + $STD uv sync --active --locked --no-default-groups fi mv /opt/start.sh.bak /opt/shelfmark/start.sh msg_ok "Updated Shelfmark" diff --git a/install/shelfmark-install.sh b/install/shelfmark-install.sh index b6195a08b..22597eaf9 100644 --- a/install/shelfmark-install.sh +++ b/install/shelfmark-install.sh @@ -116,7 +116,7 @@ else fi NODE_VERSION="24" setup_nodejs -PYTHON_VERSION="3.12" setup_uv +PYTHON_VERSION="3.14" setup_uv fetch_and_deploy_gh_release "shelfmark" "calibrain/shelfmark" "tarball" "latest" "/opt/shelfmark" RELEASE_VERSION=$(cat "$HOME/.shelfmark") @@ -130,11 +130,15 @@ mv /opt/shelfmark/src/frontend/dist /opt/shelfmark/frontend-dist msg_ok "Built Shelfmark frontend" msg_info "Configuring Shelfmark" +export VIRTUAL_ENV=/opt/shelfmark/venv cd /opt/shelfmark $STD uv venv --clear ./venv $STD source ./venv/bin/activate -$STD uv pip install -r ./requirements-base.txt -[[ "$DEPLOYMENT_TYPE" == "1" ]] && $STD uv pip install -r ./requirements-shelfmark.txt +if [[ "$DEPLOYMENT_TYPE" == "1" ]]; then + $STD uv sync --active --locked --no-default-groups --extra browser +else + $STD uv sync --active --locked --no-default-groups +fi mkdir -p {/var/log/shelfmark,/tmp/shelfmark} msg_ok "Configured Shelfmark"