dgunchev/profile.d
1
0
Fork 0
mirror of https://github.com/gwebu-team/profile.d.git synced 2025-12-11 12:15:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix python virtual environment support.
Some checks failed
Makefile CI / build (push) Has been cancelled
Details

Browse source 
This works with python 3.9, 3.10, 3.11 and 3.12 on MacOS.
This commit is contained in:
Doncho Gunchev 2024-07-15 10:54:24 +03:00
parent b3f0f66356
commit 2ad5d376af
No known key found for this signature in database
GPG key ID: D3FF0619433A66E2
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -11,11 +11,12 @@ help:
@echo "▀▀▀▀▀▀" @echo "▀▀▀▀▀▀"
@echo @echo
@echo "Available targets:" @echo "Available targets:"
@echo " dist: create source distribution package in dist/" @echo " dist: Create source distribution package in dist/."
@echo " rpm: create an RPM package" @echo " rpm: Create an RPM package."
@echo " changelog: Add a changelog entry to gwebu-profile.spec.in" @echo " podman_rpm Create an RPM package using podman on MacOS."
@echo " changelog: Add a changelog entry to gwebu-profile.spec.in."
@echo @echo
@echo " clean: clean all generated files" @echo " clean: Clean all generated files."
@echo @echo
@echo "Version $(ver), rpm_ver=$(rpm_ver), rpm_rev=$(rpm_rev)." @echo "Version $(ver), rpm_ver=$(rpm_ver), rpm_rev=$(rpm_rev)."
.PHONY: help .PHONY: help

4
etc/profile.d/z-ps-twtty-7.sh
View file

@ -81,9 +81,9 @@ function prompt_command() {
local prompt="--($my_D, Err ${my_P[*]}, $my_TTY)---($PWD)--" local prompt="--($my_D, Err ${my_P[*]}, $my_TTY)---($PWD)--"
if [ -n "${VIRTUAL_ENV:-}" ] && [ -n "$_OLD_VIRTUAL_PS1" ]; then if [ -n "${VIRTUAL_ENV:-}" ] && [ -n "$_OLD_VIRTUAL_PS1" ]; then
my_VENV="${VIRTUAL_ENV_PROMPT}" export my_VENV="${VIRTUAL_ENV##*/}"
prompt="--($my_D, Err ${my_P[*]}, $my_TTY, $my_VENV)---($PWD)--" prompt="--($my_D, Err ${my_P[*]}, $my_TTY, $my_VENV)---($PWD)--"
if [ "${PS1:1:${#VIRTUAL_ENV_PROMPT}}" == "$VIRTUAL_ENV_PROMPT" ]; then if [ "${PS1:0:${#my_VENV}+3}" == "($my_VENV) " ]; then
# PS1 will be restored by virtual environment's deactivate script. # PS1 will be restored by virtual environment's deactivate script.
# Yeah, that has to be done better, 172 is correct but magic number. # Yeah, that has to be done better, 172 is correct but magic number.
export PS1="${_OLD_VIRTUAL_PS1:0:172}, ${my_VENV}${_OLD_VIRTUAL_PS1:172}" export PS1="${_OLD_VIRTUAL_PS1:0:172}, ${my_VENV}${_OLD_VIRTUAL_PS1:172}"

6
gwebu-profile.spec.in
View file

@ -1,7 +1,7 @@
Summary: Gwebu profile.d - cool date, prompt with history, aliases Summary: Gwebu profile.d - cool date, prompt with history, aliases
Name: gwebu-profile Name: gwebu-profile
Version: 1.0.3 Version: 1.0.3
Release: 0 Release: 2
BuildArch: noarch BuildArch: noarch
License: GPLv2 License: GPLv2
Source0: profile.d-%{version}-%{release}.tar.xz Source0: profile.d-%{version}-%{release}.tar.xz
@ -41,6 +41,10 @@ install -m 0644 etc/profile.d/*.sh %{buildroot}%{_sysconfdir}/profile.d/
%changelog %changelog
* 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.
* Sun Jul 14 2024 Doncho Gunchev <doncho.gunchev@flyrlabs.com> - 1.0.3-0 * Sun Jul 14 2024 Doncho Gunchev <doncho.gunchev@flyrlabs.com> - 1.0.3-0
- Initial python virtual environment support. - Initial python virtual environment support.