From f2a1a5eafe2191ccdb8b4c64589f5fa7210a6bc5 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Mon, 10 Feb 2025 16:59:38 +0100 Subject: [PATCH] Outsource install and startup code to plomlib. --- install.sh | 13 +------------ plomlib | 2 +- taskplom | 18 ------------------ 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100755 taskplom diff --git a/install.sh b/install.sh index babdd30..fefb821 100755 --- a/install.sh +++ b/install.sh @@ -1,13 +1,2 @@ #!/usr/bin/sh -set -e - -PATH_APP_SHARE=~/.local/share/taskplom -PATH_LOCAL_BIN=~/.local/bin -NAME_EXECUTABLE=taskplom - -mkdir -p "${PATH_APP_SHARE}" "${PATH_LOCAL_BIN}" - -cp -rL ./src/* "${PATH_APP_SHARE}/" -cp "${NAME_EXECUTABLE}" "${PATH_LOCAL_BIN}/" - -echo "Installed executable to ${PATH_LOCAL_BIN}/${NAME_EXECUTABLE}, app files to ${PATH_APP_SHARE}." +./plomlib/sh/install.sh taskplom diff --git a/plomlib b/plomlib index 0b4baee..0bf9480 160000 --- a/plomlib +++ b/plomlib @@ -1 +1 @@ -Subproject commit 0b4baee83e05737b24360e395393a87658feeee2 +Subproject commit 0bf94804e718fb4d41995dbfe9c6dc3315d366f2 diff --git a/taskplom b/taskplom deleted file mode 100755 index 4bc1be6..0000000 --- a/taskplom +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/sh -set -e - -PATH_APP_SHARE=~/.local/share/taskplom -PATH_VENV="${PATH_APP_SHARE}/venv" - -python3 -m venv "${PATH_VENV}" -. "${PATH_VENV}/bin/activate" - -if [ "$1" = "install_deps" ]; then - echo "Checking dependencies." - pip3 install -r "${PATH_APP_SHARE}/requirements.txt" - exit 0 -fi - -export PYTHONPATH="${PATH_APP_SHARE}:${PYTHONPATH}" -cd "${PATH_APP_SHARE}" -./run.py $@ -- 2.30.2