Compare commits

..

1 commit

Author SHA1 Message Date
Doncho Gunchev
2ad5d376af
Fix python virtual environment support.
Some checks failed
Makefile CI / build (push) Has been cancelled
This works with python 3.9, 3.10, 3.11 and 3.12 on MacOS.
2024-07-15 10:59:06 +03:00
4 changed files with 7 additions and 10 deletions

View file

@ -51,9 +51,10 @@ clean:
.PHONY: podman_rpm
podman_rpm: dist
podman_rpm:
podman buildx build -t podman_rpm_build -f Dockerfile-build . # --platform linux/amd64
# Extract the RPMs from the container to ./dist/ locally.
if ! test -d dist; then mkdir dist; fi
podman run --rm -d --name=build localhost/podman_rpm_build /usr/bin/bash -c "trap : TERM INT; sleep infinity & wait"
podman cp build:/tmp/RPMS/. ./dist/
podman stop build

View file

@ -13,7 +13,7 @@ DIST_PRE="${PLATFORM_ID##*:}" # el8
DIST="${DIST:-${DIST_PRE%%[0-9]*}}" # el
OUT_DIR="/tmp/RPMS"
export LANG='C.UTF-8'
export LANG='en_US.UTF-8'
export LANGUAGE="${LANG}"
export LC_ALL="${LANG}"
export LC_MEASUREMENT="${LANG}"

View file

@ -81,11 +81,7 @@ function prompt_command() {
local prompt="--($my_D, Err ${my_P[*]}, $my_TTY)---($PWD)--"
if [ -n "${VIRTUAL_ENV:-}" ] && [ -n "$_OLD_VIRTUAL_PS1" ]; then
if [ -n "$VIRTUAL_ENV_PROMPT" ]; then
export my_VENV="$VIRTUAL_ENV_PROMPT"
else
export my_VENV="${VIRTUAL_ENV##*/}"
fi
export my_VENV="${VIRTUAL_ENV##*/}"
prompt="--($my_D, Err ${my_P[*]}, $my_TTY, $my_VENV)---($PWD)--"
if [ "${PS1:0:${#my_VENV}+3}" == "($my_VENV) " ]; then
# PS1 will be restored by virtual environment's deactivate script.

View file

@ -1,7 +1,7 @@
Summary: Gwebu profile.d - cool date, prompt with history, aliases
Name: gwebu-profile
Version: 1.0.4
Release: 0
Version: 1.0.3
Release: 2
BuildArch: noarch
License: GPLv2
Source0: profile.d-%{version}-%{release}.tar.xz
@ -41,7 +41,7 @@ install -m 0644 etc/profile.d/*.sh %{buildroot}%{_sysconfdir}/profile.d/
%changelog
* Mon Jul 15 2024 Doncho Gunchev <doncho.gunchev@flyrlabs.com> - 1.0.4-0
* Mon Jul 15 2024 Doncho Gunchev <doncho.gunchev@flyrlabs.com> - 1.0.3-2
- Fix python virtual environment support.
This works on MacOS with python 3.9, 3.10, 3.11 and 3.12.