-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/dev' into faster-spawnveg
- Loading branch information
Showing
14 changed files
with
256 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -151,7 +151,7 @@ command=${0##*/} | |
| case $(getopts '[-][123:xyz]' opt --xyz 2>/dev/null; echo 0$opt) in | ||
| 0123) USAGE=$' | ||
| [-? | ||
| @(#)$Id: '$command$' (ksh 93u+m) 2024-02-17 $ | ||
| @(#)$Id: '$command$' (ksh 93u+m) 2024-02-22 $ | ||
| ] | ||
| [-author?Glenn Fowler <[email protected]>] | ||
| [-author?Contributors to https://github.com/ksh93/ksh] | ||
|
|
@@ -579,7 +579,7 @@ SEE ALSO | |
| pkgadd(1), pkgmk(1), rpm(1), sh(1), tar(1), optget(3) | ||
|
|
||
| IMPLEMENTATION | ||
| version package (ksh 93u+m) 2024-02-17 | ||
| version package (ksh 93u+m) 2024-02-22 | ||
| author Glenn Fowler <[email protected]> | ||
| author Contributors to https://github.com/ksh93/ksh | ||
| copyright (c) 1994-2012 AT&T Intellectual Property | ||
|
|
@@ -2138,13 +2138,7 @@ case $x in | |
|
|
||
| # tame the environment | ||
|
|
||
| case $action in | ||
| use) ;; | ||
| *) ENV= | ||
| ERROR_OPTIONS= | ||
| export ENV ERROR_OPTIONS | ||
| ;; | ||
| esac | ||
| unset ERROR_OPTIONS ENV | ||
|
|
||
| # finalize the views | ||
|
|
||
|
|
@@ -3320,6 +3314,7 @@ use) # finalize the environment | |
| if test "$KEEP_SHELL" -lt 2 && executable "$INSTALLROOT/bin/ksh" | ||
| then SHELL=$INSTALLROOT/bin/ksh | ||
| fi | ||
| export ENV=$INSTALLROOT/etc/kshrc | ||
| x=:.. | ||
| for d in $(set +o noglob; cd $PACKAGEROOT; ls src/*/Mamfile 2>/dev/null | sed 's,/[^/]*$,,' | sort -u) | ||
| do x=$x:$INSTALLROOT/$d | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,184 @@ | ||
| ######################################################################## | ||
| # # | ||
| # This file is part of the ksh 93u+m package # | ||
| # Copyright (c) 2022-2024 Contributors to ksh 93u+m # | ||
| # and is licensed under the # | ||
| # Eclipse Public License, Version 2.0 # | ||
| # # | ||
| # A copy of the License is available at # | ||
| # https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html # | ||
| # (with md5 checksum 84283fa8859daf213bdda5a9f8d1be1d) # | ||
| # # | ||
| # Martijn Dekker <[email protected]> # | ||
| # Johnothan King <[email protected]> # | ||
| # # | ||
| ######################################################################## | ||
|
|
||
| # A nice default .kshrc for 'bin/package use' | ||
| # Feel free to adapt and use as your own ~/.kshrc | ||
| # NOTE: much of this requires ksh 93u+m | ||
|
|
||
| # create a namespace for global kshrc stuff | ||
| typeset .rc | ||
|
|
||
| .rc.me=${0##*/} # a $0 without dir that won't change in functions | ||
| .rc.uid=${ id -u; } | ||
| .rc.uname=${ id -un; } | ||
| .rc.host=${ uname -n; } | ||
| .rc.host=${.rc.host%%.*} # remove domain | ||
| .rc.tty=${ tty; } | ||
| .rc.tty=${.rc.tty##*/} # remove dir | ||
|
|
||
| # ANSI foreground colours | ||
| .rc.clr=( | ||
| [magenta]=$'\E[35m' | ||
| [blue]=$'\E[34m' | ||
| [cyan]=$'\E[36m' | ||
| [red]=$'\E[31m' | ||
| ) | ||
|
|
||
| # Formatting codes | ||
| .rc.fmt=( | ||
| [ansiprefix]=$'\E[' | ||
| [reset]=$'\E[0m' | ||
| [underline]=$'\E[4m' | ||
| [bold]=$'\E[1m' | ||
| ) | ||
|
|
||
| # extend tilde expansion functionality: | ||
| # define some nice default shortcuts and add some warnings | ||
| function .sh.tilde.get | ||
| { | ||
| case ${.sh.tilde} in | ||
| '~tmp') .sh.value=${XDG_RUNTIME_DIR:-${TMPDIR:-/tmp}} ;; | ||
| '~doc') .sh.value=~/Documents ;; | ||
| '~ast') [[ -v INSTALLROOT ]] && .sh.value=$INSTALLROOT ;; | ||
| '~today') | ||
| printf -v .sh.value "%s/Documents/Projects/%(%Y-%m-%d)T" "$HOME" "now" | ||
| if [[ ! -d ${.sh.value} && ! -L ${.sh.value} ]]; then | ||
| printf '%s: creating directory %q\n' "${.rc.me}" "${.sh.value}" >&2 | ||
| mkdir -p "${.sh.value}" | ||
| fi ;; | ||
| \~*[![:alnum:]._-]*) | ||
| printf '%s: warning: %s: bad username\n' "${.rc.me}" "${.sh.tilde#\~}" >&2 ;; | ||
| \~*) eval ".sh.value=${.sh.tilde}" # perform default expansion | ||
| if [[ ${.sh.value} == "${.sh.tilde}" ]]; then | ||
| printf '%s: warning: %s: unknown username\n' "${.rc.me}" "${.sh.tilde#\~}" >&2 | ||
| fi ;; | ||
| esac | ||
| } | ||
|
|
||
| # RELPWD expands to relative current working directory with ~ support | ||
| # and configurable number of pathname components kept | ||
| function RELPWD.get | ||
| { | ||
| typeset del ellip=$'\u2026' v=$PWD keep=${RELPWD.keep} | ||
| ((${#ellip}==1)) || ellip='...' | ||
| [[ ($v == "$HOME" || $v == "$HOME"/*) && $HOME != / ]] && v=\~${v#"$HOME"} | ||
| if [[ -n $keep ]] | ||
| then del=${v%/$keep}/ | ||
| [[ $v == /*/$keep ]] && v=$ellip/${v#"$del"} | ||
| [[ $v == \~/*/$keep ]] && v=\~/$ellip/${v#"$del"} | ||
| fi | ||
| .sh.value=$v | ||
| } | ||
| # convert <=1 to *, 2 to */*, 3 to */*/*, etc. | ||
| function RELPWD.keep.set | ||
| { | ||
| typeset -si i n | ||
| let "(n=${.sh.value}) ? 1 : 1" 2>/dev/null || n=2 | ||
| ((n>64)) && n=64 # sanity check | ||
| ((n<1)) && .sh.value='' && return | ||
| .sh.value='*' | ||
| for ((i=2; i <= n; i++)) | ||
| do .sh.value+='/*' | ||
| done | ||
| } | ||
| # change this anytime to set number of pathname components kept | ||
| # set to 0 to keep all (but still change your home directory to ~) | ||
| RELPWD.keep=3 | ||
|
|
||
| # get the current git branch | ||
| function GITBRANCH.get | ||
| { | ||
| command -v git >/dev/null || return | ||
| .sh.value=${ git branch --show-current 2>/dev/null; } && return | ||
| # fallback for old git versions without --show-current: | ||
| .sh.value=${ git branch 2>/dev/null; } | ||
| case $'\n'${.sh.value} in | ||
| *$'\n* '*) | ||
| .sh.value=$'\n'${.sh.value} | ||
| .sh.value=${.sh.value#*$'\n* '} | ||
| .sh.value=${.sh.value%%$'\n'*} | ||
| ;; | ||
| *) .sh.value='' | ||
| ;; | ||
| esac | ||
| } | ||
|
|
||
| # the regular (PS1) and line continuation (PS2) prompts | ||
|
|
||
| typeset -sui .rc.ps2_lineno=0 | ||
| case ${.rc.uid} in | ||
| 0) .rc.clr1=${.rc.clr[magenta]} .rc.clr2=${.rc.clr[red]} .rc.char='#' ;; | ||
| *) .rc.clr1=${.rc.clr[blue]} .rc.clr2=${.rc.clr[cyan]} .rc.char='$' ;; | ||
| esac | ||
|
|
||
| # use single quotes to avoid expanding variables now, because PS1 is special: | ||
| # it expands variables in its value even without a discipline function. | ||
| # Also, '!' expands to the history file number (see 'man fc'). | ||
| PS1='${.rc.fmt[ansiprefix]}$((${?}?31:32))m$?${.rc.fmt[reset]}<${.rc.clr1}!${.rc.fmt[reset]}' | ||
| PS1+=':${.rc.clr2}${RELPWD}${GITBRANCH:+${.rc.clr1}[${GITBRANCH}]}${.rc.fmt[reset]} ${.rc.char} ' | ||
|
|
||
| function PS1.get | ||
| { | ||
| # reset PS2 counter whenever PS1 is shown | ||
| .rc.ps2_lineno=0 | ||
| } | ||
|
|
||
| # PS2 (like normal variables) does not expand anything by itself, | ||
| # but we can use a discipline function to make it act dynamically | ||
| function PS2.get | ||
| { | ||
| typeset clr1 clr2 char | ||
| case ${.rc.uid} in | ||
| 0) clr1=${.rc.clr[magenta]} clr2=${.rc.clr[red]} ;; | ||
| *) clr1=${.rc.clr[blue]} clr2=${.rc.clr[cyan]} ;; | ||
| esac | ||
| char=$'\u22d7' # greater-than with dot (UTF-8) | ||
| ((${#char}==1)) || char='>' | ||
| ((.rc.ps2_lineno++)) | ||
| printf -v .sh.value ' %s%s%02d%s%s %c%s ' \ | ||
| "$clr1" \ | ||
| "${.rc.fmt[underline]}" \ | ||
| .rc.ps2_lineno \ | ||
| "${.rc.fmt[reset]}" \ | ||
| "$clr2" \ | ||
| "$char" \ | ||
| "${.rc.fmt[reset]}" | ||
| } | ||
|
|
||
| # stuff for when this is run from 'bin/package use' | ||
| if [[ -v INSTALLROOT ]] | ||
| then | ||
| # make shipped functions available | ||
| case $FPATH: in | ||
| "$INSTALLROOT"/fun:*) | ||
| ;; | ||
| *) FPATH=$INSTALLROOT/fun${FPATH:+:$FPATH} ;; | ||
| esac | ||
| export FPATH | ||
| autoload autocd cd dirs man mcd popd pushd | ||
| # do not intefere with the regular ksh history | ||
| [[ -d $INSTALLROOT/var ]] || mkdir -p "$INSTALLROOT/var" | ||
| HISTFILE=$INSTALLROOT/var/sh_history_${.rc.tty} | ||
|
|
||
| # Print welcome message | ||
| set -- ${.sh.version} | ||
| print -r "${.rc.fmt[bold]}Welcome to ksh ${.rc.clr[red]}$3 ${.rc.clr[blue]}$4${.rc.fmt[reset]} on ${.rc.fmt[bold]}${.rc.host} (${.rc.tty})${.rc.fmt[reset]}" | ||
| set -- | ||
| print -r -- "- Have a look at ${.rc.fmt[bold]}~ast/etc/kshrc${.rc.fmt[reset]} to see all the cool stuff activated here" | ||
| print -r -- "- Type '${.rc.fmt[bold]}builtin${.rc.fmt[reset]}' for a list of built-in commands (with and without path)" | ||
| print -r -- "- Get help: use '${.rc.fmt[bold]}man${.rc.fmt[reset]} ${.rc.fmt[underline]}commandname${.rc.fmt[reset]}' for everything, even built-in commands" | ||
| print -r -- "- Autoloadable functions have been activated. Check them out in ${.rc.fmt[bold]}~ast/fun${.rc.fmt[reset]}" | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.