Compare commits

...

3 Commits

Author SHA1 Message Date
88ccccdb50 Fix setting window title when in project dir 2025-11-07 12:36:15 -05:00
f2f34750ac Fix errors passing project arg through container init in dev func
Fix usage of old PROJECTS_DIR env var in starship setup
2025-11-07 12:33:18 -05:00
8e5ea523b2 Fix dev function not properly mapping arg to project var 2025-11-07 12:01:28 -05:00
2 changed files with 9 additions and 8 deletions

View File

@@ -1,6 +1,6 @@
function set_window_title() {
if [ "${PWD}" == "$PROJECTS_DIR/*" ]; then
echo -ne "\033]0; Toolbox: Development \007"
if [[ "${PWD}" == $PROJECTS_PATH/* ]]; then
echo -ne "\033]0; Project: $(basename ${PWD}) \007"
else
echo -ne "\033]0; $LOCATION \007"
fi

View File

@@ -5,11 +5,11 @@ function dev() {
echo "WARNING: Missing project name";
project=""
else
project="${2}"
project="${1}"
fi
if [ -f '/run/.toolboxenv' ]; then
cd "${PROJECTS_DIR}/${project}";
cd "${PROJECTS_PATH}/${project}";
if [ -f "${PWD}/ansible.cfg" ]; then
export ANSIBLE_CONFIG="${PWD}/ansible.cfg";
@@ -19,7 +19,7 @@ function dev() {
if [ -f "${PWD}/pyproject.toml" ]; then
poetry_venv=$(poetry env info --path)
if [ ! -z "${poetry_venv}" ]; then
if [ ! -z "${poetry_venv}" ] && [ -f "${poetry_venv}/bin/activate" ]; then
source "${poetry_venv}/bin/activate";
fi
fi
@@ -40,7 +40,7 @@ function dev() {
echo ">>> ${PWD}"
toolbox enter "${container_name}"
echo ">>> Exited: ${container_name}"
cd ${current}
cd "${current}"
podman container stop "${container_name}" &>/dev/null
podman container rm --force "${container_name}" &>/dev/null
@@ -48,7 +48,8 @@ function dev() {
}
if [ -f '/run/.toolboxenv' ]; then
if [ "${PWD}" == "$PROJECTS_PATH/*" ]; then
if [[ "${PWD}" == $PROJECTS_PATH/* ]]; then
dev $(basename "${PWD}")
fi
fi
fi