From 5a659f01a45e4c2cd1dafbc910c823415798dcea Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 24 May 2017 13:32:52 +1200 Subject: Remove Yash support I never use it --- Makefile | 20 ++------------------ README.markdown | 7 +------ check/login-shell.sh | 2 -- check/yash.sh | 5 ----- install/install-login-shell.sh | 2 -- ksh/shrc.d/ksh.sh | 2 +- lint/yash.sh | 1 - yash/yash_profile | 2 -- yash/yashrc | 14 -------------- yash/yashrc.d/ver.yash | 4 ---- 10 files changed, 4 insertions(+), 55 deletions(-) delete mode 100644 check/yash.sh delete mode 100644 lint/yash.sh delete mode 100644 yash/yash_profile delete mode 100644 yash/yashrc delete mode 100644 yash/yashrc.d/ver.yash diff --git a/Makefile b/Makefile index 999b90ac..e5cb262b 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,6 @@ install-vim-pathogen \ install-vim-plugins \ install-x \ - install-yash \ install-zsh \ check \ check-bash \ @@ -54,7 +53,6 @@ check-sh \ check-urxvt \ check-xinit \ - check-yash \ check-zsh \ lint \ lint-bash \ @@ -63,8 +61,7 @@ lint-ksh \ lint-sh \ lint-urxvt \ - lint-xinit \ - lint-yash + lint-xinit .SUFFIXES: .SUFFIXES: .awk .bash .pl .sed .sh @@ -446,12 +443,6 @@ install-x: check-xinit cp -p -- X/Xresources $(HOME)/.Xresources cp -p -- X/Xresources.d/* $(HOME)/.Xresources.d -install-yash: install-yash install-sh - mkdir -p -- $(HOME)/.yashrc.d - cp -p -- yash/yash_profile $(HOME)/.yash_profile - cp -p -- yash/yashrc $(HOME)/.yashrc - cp -p -- yash/yashrc.d/* $(HOME)/.yashrc.d - install-zsh: check-zsh install-sh mkdir -p -- $(HOME)/.profile.d $(HOME)/.zshrc.d cp -p -- zsh/profile.d/* $(HOME)/.profile.d @@ -491,9 +482,6 @@ check-urxvt: check-xinit: sh check/xinit.sh -check-yash: - sh check/yash.sh - check-zsh: sh check/zsh.sh @@ -503,8 +491,7 @@ lint: lint-bash \ lint-ksh \ lint-sh \ lint-urxvt \ - lint-xinit \ - lint-yash + lint-xinit lint-bash: check-bash sh lint/bash.sh @@ -526,6 +513,3 @@ lint-urxvt: check-urxvt lint-xinit: check-xinit sh lint/xinit.sh - -lint-yash: check-yash - sh lint/yash.sh diff --git a/README.markdown b/README.markdown index 8bfd8c51..06e585ef 100644 --- a/README.markdown +++ b/README.markdown @@ -65,7 +65,6 @@ Configuration is included for: some helper functions: * [GNU Bash](https://www.gnu.org/software/bash/) (2.05a or higher) * [Korn shell](http://www.kornshell.com/) (`ksh93`, `pdksh`, `mksh`) - * [Yash](https://yash.osdn.jp/index.html.en) * [Z shell](https://www.zsh.org/) * [Abook](http://abook.sourceforge.net/) -- curses address book program * [cURL](https://curl.haxx.se/) -- Command-line tool for transferring data @@ -239,7 +238,7 @@ non-POSIX features, as compatibility allows: * `vared()` allows interactively editing a variable with Readline, emulating a Zsh function I like by the same name (Bash). * `ver()` prints the current shell's version information (Bash, Korn Shell, - Yash, Z shell). + Z shell). #### Completion @@ -276,10 +275,6 @@ These are experimental; they are mostly used to tinker with MirBSD `mksh`, AT&T `ksh93`, and OpenBSD `pdksh`. All shells in this family default to a yellow prompt if detected. -#### Yash - -Just enough configuration to coax it into reading `~/.profile` and `~/.shrc`. - #### Zsh These are experimental; I do not like Zsh much at the moment. The files started diff --git a/check/login-shell.sh b/check/login-shell.sh index 20327b94..2972d98d 100644 --- a/check/login-shell.sh +++ b/check/login-shell.sh @@ -4,8 +4,6 @@ case ${SHELL##*/} in target=check-bash ;; ksh|ksh88|ksh93|mksh|pdksh) target=check-ksh ;; - yash) - target=check-yash ;; zsh) target=check-zsh ;; esac diff --git a/check/yash.sh b/check/yash.sh deleted file mode 100644 index c8722f3d..00000000 --- a/check/yash.sh +++ /dev/null @@ -1,5 +0,0 @@ -for yash in yash/* ; do - [ -f "$yash" ] || continue - yash -n "$yash" || exit -done -printf 'All yash scripts parsed successfully.\n' diff --git a/install/install-login-shell.sh b/install/install-login-shell.sh index b7292a77..f38aa0c1 100644 --- a/install/install-login-shell.sh +++ b/install/install-login-shell.sh @@ -4,8 +4,6 @@ case ${SHELL##*/} in target=install-bash ;; ksh|ksh88|ksh93|mksh|pdksh) target=install-ksh ;; - yash) - target=install-yash ;; zsh) target=install-zsh ;; esac diff --git a/ksh/shrc.d/ksh.sh b/ksh/shrc.d/ksh.sh index aa5c4cbc..b591f37c 100644 --- a/ksh/shrc.d/ksh.sh +++ b/ksh/shrc.d/ksh.sh @@ -9,7 +9,7 @@ # makes other shells throw tantrums. # Does the name of our shell have "ksh" in it at all? This is in no way -# guaranteed. It's just a heuristic that e.g. Bash and Yash shouldn't pass. +# guaranteed. It's just a heuristic that e.g. Bash shouldn't pass. case $0 in *ksh*) ;; *) return ;; diff --git a/lint/yash.sh b/lint/yash.sh deleted file mode 100644 index d783e077..00000000 --- a/lint/yash.sh +++ /dev/null @@ -1 +0,0 @@ -find yash -type f -print -exec shellcheck -e SC1090 -s sh -- {} + diff --git a/yash/yash_profile b/yash/yash_profile deleted file mode 100644 index d37f35a1..00000000 --- a/yash/yash_profile +++ /dev/null @@ -1,2 +0,0 @@ -# Load ~/.profile, because Yash won't by itself, no matter how you invoke it -[ -e "$HOME"/.profile ] && . "$HOME"/.profile diff --git a/yash/yashrc b/yash/yashrc deleted file mode 100644 index c2b2df26..00000000 --- a/yash/yashrc +++ /dev/null @@ -1,14 +0,0 @@ -# Clear away all aliases; we do this here rather than in $ENV because the ksh -# family of shells relies on aliases to implement certain POSIX utilities like -# fc(1) and type(1) -unalias -a - -# Load POSIX interactive shell startup files, because Yash won't do it if not -# invoked as sh(1) -[ -e "$ENV" ] && . "$ENV" - -# Load Bash-specific startup files -for sh in "$HOME"/.yashrc.d/*.yash ; do - [ -e "$sh" ] && . "$sh" -done -unset -v sh diff --git a/yash/yashrc.d/ver.yash b/yash/yashrc.d/ver.yash deleted file mode 100644 index 8bd06e4d..00000000 --- a/yash/yashrc.d/ver.yash +++ /dev/null @@ -1,4 +0,0 @@ -# Shortcut to show current shell version -ver() { - printf '%s\n' "${YASH_VERSION:-unknown}" -} -- cgit v1.2.3