traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-29076: Add fish support to macOS installer (GH-23302) 

(cherry picked from commit 7f162e867c)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
This commit is contained in:
Erlend Egeberg Aasland 2020-12-25 12:01:30 +01:00 committed by Miss Islington (bot)
parent d5aadb2854
commit 53707ebf90
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Mac/BuildScript/scripts/postflight.patch-profile
View File

@ -20,7 +20,7 @@ fi
# Make sure the directory ${PYTHON_ROOT}/bin is on the users PATH. # Make sure the directory ${PYTHON_ROOT}/bin is on the users PATH.
BSH="`basename "${theShell}"`" BSH="`basename "${theShell}"`"
case "${BSH}" in case "${BSH}" in
bash|ksh|sh|*csh|zsh) bash|ksh|sh|*csh|zsh|fish)
if [ `id -ur` = 0 ]; then if [ `id -ur` = 0 ]; then
P=`su - ${USER} -c 'echo A-X-4-X@@$PATH@@X-4-X-A' | grep 'A-X-4-X@@.*@@X-4-X-A' | sed -e 's/^A-X-4-X@@//g' -e 's/@@X-4-X-A$//g'` P=`su - ${USER} -c 'echo A-X-4-X@@$PATH@@X-4-X-A' | grep 'A-X-4-X@@.*@@X-4-X-A' | sed -e 's/^A-X-4-X@@//g' -e 's/@@X-4-X-A$//g'`
else else
@ -76,6 +76,22 @@ bash)
PR="${HOME}/.bash_profile" PR="${HOME}/.bash_profile"
fi fi
;; ;;
fish)
CONFIG_DIR="${HOME}/.config/fish"
RC="${CONFIG_DIR}/config.fish"
mkdir -p "$CONFIG_DIR"
if [ -f "${RC}" ]; then
cp -fp "${RC}" "${RC}.pysave"
fi
echo "" >> "${RC}"
echo "# Setting PATH for Python ${PYVER}" >> "${RC}"
echo "# The original version is saved in ${RC}.pysave" >> "${RC}"
echo "set -x PATH \"${PYTHON_ROOT}/bin\" \"\$PATH\"" >> "${RC}"
if [ `id -ur` = 0 ]; then
chown "${USER}" "${RC}"
fi
exit 0
;;
zsh) zsh)
PR="${HOME}/.zprofile" PR="${HOME}/.zprofile"
;; ;;

1
Misc/NEWS.d/next/Build/2020-02-28-14-33-15.bpo-29076.Gtixi5.rst Normal file
View File

@ -0,0 +1 @@
Add fish shell support to macOS installer.