From 35efce33c5fa58f2090865423968a51134724f34 Mon Sep 17 00:00:00 2001 From: Malin Date: Mon, 9 Feb 2026 07:35:46 +0100 Subject: [PATCH] fix: install from local checkout and remove dead wo_deb_repo code - wo_install() now detects local setup.py and installs from it instead of always pulling from PyPI/GitHub (which installs the old upstream) - Removed unused wo_deb_repo variable branches in variables.py that caused NameError on unsupported codenames - OLS repo URL uses codename directly for all distros (same format) Co-Authored-By: Claude Opus 4.6 --- install | 4 +++- wo/core/variables.py | 29 +++-------------------------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/install b/install index 7d0b908..c5c259a 100755 --- a/install +++ b/install @@ -552,7 +552,9 @@ wo_install() { fi fi - if [ "$wo_branch" = "master" ]; then + if [ -f ./setup.py ]; then + /opt/wo/bin/pip install -U . --upgrade-strategy=eager + elif [ "$wo_branch" = "master" ]; then /opt/wo/bin/pip install -U wordops --upgrade-strategy=eager else /opt/wo/bin/pip install -I "git+https://github.com/WordOps/WordOps.git@$wo_branch#egg=wordops" --upgrade-strategy=eager diff --git a/wo/core/variables.py b/wo/core/variables.py index 0b2acb8..9df7908 100644 --- a/wo/core/variables.py +++ b/wo/core/variables.py @@ -122,32 +122,9 @@ class WOVar(): wo_ols_ctrl = '/usr/local/lsws/bin/lswsctrl' # OpenLiteSpeed repo and packages - if wo_distro == 'ubuntu': - wo_ols_repo = ("deb [signed-by=/usr/share/keyrings/openlitespeed-keyring.gpg] " - "http://rpms.litespeedtech.com/debian/ " - "{0} main".format(wo_platform_codename)) - else: - if wo_distro == 'debian': - if wo_platform_codename == 'buster': - wo_deb_repo = "Debian_10" - elif wo_platform_codename == 'bullseye': - wo_deb_repo = "Debian_11" - elif wo_platform_codename == 'bookworm': - wo_deb_repo = "Debian_12" - elif wo_platform_codename == 'trixie': - wo_deb_repo = "Debian_13" - elif wo_distro == 'raspbian': - if wo_platform_codename == 'buster': - wo_deb_repo = "Raspbian_10" - elif wo_platform_codename == 'bullseye': - wo_deb_repo = "Raspbian_11" - elif wo_platform_codename == 'bookworm': - wo_deb_repo = "Raspbian_12" - elif wo_platform_codename == 'trixie': - wo_deb_repo = "Raspbian_13" - wo_ols_repo = ("deb [signed-by=/usr/share/keyrings/openlitespeed-keyring.gpg] " - "http://rpms.litespeedtech.com/debian/ " - "{0} main".format(wo_platform_codename)) + wo_ols_repo = ("deb [signed-by=/usr/share/keyrings/openlitespeed-keyring.gpg] " + "http://rpms.litespeedtech.com/debian/ " + "{0} main".format(wo_platform_codename)) wo_ols = ["openlitespeed"] wo_ols_repo_key = "https://rpms.litespeedtech.com/debian/lst_debian_repo.gpg"