diff --git a/Makefile b/Makefile index 8da1508..64f2df9 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/build.sh b/build.sh index b0d3b56..95379b3 100755 --- a/build.sh +++ b/build.sh @@ -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}" diff --git a/etc/profile.d/z-ps-twtty-7.sh b/etc/profile.d/z-ps-twtty-7.sh index bc6f513..6a06f0f 100755 --- a/etc/profile.d/z-ps-twtty-7.sh +++ b/etc/profile.d/z-ps-twtty-7.sh @@ -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. diff --git a/gwebu-profile.spec.in b/gwebu-profile.spec.in index 4611bad..cd658be 100644 --- a/gwebu-profile.spec.in +++ b/gwebu-profile.spec.in @@ -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 - 1.0.4-0 +* Mon Jul 15 2024 Doncho Gunchev - 1.0.3-2 - Fix python virtual environment support. This works on MacOS with python 3.9, 3.10, 3.11 and 3.12.