From cd78e65ebb1dc1b60678f0109424022bea86c5e6 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 19 Dec 2018 15:39:55 +1300 Subject: Remove diagnostic messages from check/lint scripts So that `make -s` works nicely. --- check/bash.sh | 1 - check/bin.sh | 4 ---- check/games.sh | 1 - check/ksh.sh | 1 - check/man.sh | 3 --- check/sh.sh | 1 - check/urxvt.sh | 1 - check/xinit.sh | 1 - check/zsh.sh | 1 - lint/bash.sh | 1 - lint/bin.sh | 4 ---- lint/games.sh | 1 - lint/ksh.sh | 1 - lint/sh.sh | 1 - lint/urxvt.sh | 1 - lint/vim.sh | 1 - lint/xinit.sh | 1 - 17 files changed, 25 deletions(-) diff --git a/check/bash.sh b/check/bash.sh index 510f2af0..fbe62a0c 100644 --- a/check/bash.sh +++ b/check/bash.sh @@ -8,4 +8,3 @@ set \ for bash do bash -n -- "$bash" || exit done -printf 'GNU Bash dotfiles parsed successfully.\n' diff --git a/check/bin.sh b/check/bin.sh index 61b46af8..78c5e57d 100644 --- a/check/bin.sh +++ b/check/bin.sh @@ -2,14 +2,10 @@ for bin in bin/*.sh ; do sh -n -- "${bin%.sh}" || exit done -printf 'POSIX shell binscripts parsed successfully.\n' # GNU Bash if command -v bash >/dev/null 2>&1 ; then for bin in bin/*.bash ; do bash -n -- "${bin%.bash}" || exit done - printf 'GNU Bash binscripts parsed successfully.\n' -else - printf 'bash(1) not found, skipping GNU Bash checks.\n' fi diff --git a/check/games.sh b/check/games.sh index bea65a08..57a8151e 100644 --- a/check/games.sh +++ b/check/games.sh @@ -2,4 +2,3 @@ for game in games/*.sh ; do sh -n -- "${game%.sh}" || exit done -printf 'POSIX shell games parsed successfully.\n' diff --git a/check/ksh.sh b/check/ksh.sh index cf83bc1f..d864f504 100644 --- a/check/ksh.sh +++ b/check/ksh.sh @@ -5,4 +5,3 @@ for ksh do ksh -n -- "$ksh" || exit done sh -n -- ksh/shrc.d/ksh.sh || exit -printf 'Korn shell dotfiles parsed successfully.\n' diff --git a/check/man.sh b/check/man.sh index 89c03890..9eaff0cf 100644 --- a/check/man.sh +++ b/check/man.sh @@ -41,7 +41,4 @@ if [ -s "$td"/nobin ] ; then fi # Exit appropriately -if [ "$ex" -eq 0 ] ; then - printf 'All scripts have manual pages.\n' -fi exit "$ex" diff --git a/check/sh.sh b/check/sh.sh index e0162f47..4e816337 100644 --- a/check/sh.sh +++ b/check/sh.sh @@ -7,4 +7,3 @@ set \ for sh do sh -n -- "$sh" || exit done -printf 'POSIX shell dotfiles parsed successfully.\n' diff --git a/check/urxvt.sh b/check/urxvt.sh index 4a9e7501..e64ba1e5 100644 --- a/check/urxvt.sh +++ b/check/urxvt.sh @@ -1,4 +1,3 @@ for perl in urxvt/ext/*.pl ; do perl -c "${perl%.pl}" || exit done -printf 'URxvt Perl extensions parsed successfully.\n' diff --git a/check/xinit.sh b/check/xinit.sh index ae03b8c2..a354422a 100644 --- a/check/xinit.sh +++ b/check/xinit.sh @@ -4,4 +4,3 @@ set \ for xinit do sh -n -- "$xinit" || exit done -printf 'Xinit startup scripts parsed successfully.\n' diff --git a/check/zsh.sh b/check/zsh.sh index 0170e586..9d52b357 100644 --- a/check/zsh.sh +++ b/check/zsh.sh @@ -6,4 +6,3 @@ for zsh do zsh -n -- "$zsh" || exit done sh -n zsh/profile.d/zsh.sh || exit -printf 'Z shell dotfiles parsed successfully.\n' diff --git a/lint/bash.sh b/lint/bash.sh index 6457da35..13754a3f 100644 --- a/lint/bash.sh +++ b/lint/bash.sh @@ -6,4 +6,3 @@ set \ bash/bashrc \ bash/bashrc.d/*.bash shellcheck -e SC1090 -s bash -- "$@" || exit -printf 'GNU Bash dotfiles linted successfully.\n' diff --git a/lint/bin.sh b/lint/bin.sh index c50a2492..a98c6a73 100644 --- a/lint/bin.sh +++ b/lint/bin.sh @@ -4,7 +4,6 @@ for bin in bin/*.sh ; do set -- "$@" "${bin%.sh}" done shellcheck -e SC1090 -- "$@" || exit -printf 'POSIX shell binscripts linted successfully.\n' # GNU Bash if command -v bash >/dev/null 2>&1 ; then @@ -13,7 +12,4 @@ if command -v bash >/dev/null 2>&1 ; then set -- "$@" "${bin%.bash}" done shellcheck -e SC1090 -- "$@" || exit - printf 'GNU Bash binscripts linted successfully.\n' -else - printf 'bash(1) not found, skipping GNU Bash lint.\n' fi diff --git a/lint/games.sh b/lint/games.sh index 184728b6..e9690d8d 100644 --- a/lint/games.sh +++ b/lint/games.sh @@ -4,4 +4,3 @@ for game in games/*.sh ; do set -- "$@" "${game%.sh}" done shellcheck -e SC1090 -- "$@" || exit -printf 'POSIX shell games linted successfully.\n' diff --git a/lint/ksh.sh b/lint/ksh.sh index 102e0e54..117909b3 100644 --- a/lint/ksh.sh +++ b/lint/ksh.sh @@ -3,4 +3,3 @@ set \ ksh/kshrc.d/*.ksh shellcheck -e SC1090 -s ksh -- "$@" || exit shellcheck -e SC1090 -s sh -- ksh/shrc.d/ksh.sh || exit -printf 'Korn shell dotfiles linted successfully.\n' diff --git a/lint/sh.sh b/lint/sh.sh index c1c972c8..b0d28e5d 100644 --- a/lint/sh.sh +++ b/lint/sh.sh @@ -5,4 +5,3 @@ set \ sh/shrc \ sh/shrc.d/*.sh shellcheck -e SC1090 -s sh -- "$@" || exit -printf 'POSIX shell dotfiles linted successfully.\n' diff --git a/lint/urxvt.sh b/lint/urxvt.sh index 477157f7..6e5fb503 100644 --- a/lint/urxvt.sh +++ b/lint/urxvt.sh @@ -3,4 +3,3 @@ for pl in urxvt/ext/*.pl ; do set -- "$@" "${pl%.pl}" done perlcritic --brutal -- "${pl%.pl}" -printf 'URxvt Perl extensions linted successfully.\n' diff --git a/lint/vim.sh b/lint/vim.sh index 43eaf4c8..bd8e73af 100644 --- a/lint/vim.sh +++ b/lint/vim.sh @@ -17,4 +17,3 @@ done # Run check vint -s -- "$@" || exit -printf 'Vim configuration linted successfully.\n' diff --git a/lint/xinit.sh b/lint/xinit.sh index b2718874..0fab84d2 100644 --- a/lint/xinit.sh +++ b/lint/xinit.sh @@ -2,4 +2,3 @@ set \ X/xinitrc \ X/xinitrc.d/*.sh shellcheck -e SC1090 -s sh -- "$@" -printf 'Xinit startup scripts linted successfully.\n' -- cgit v1.2.3 From b928bfdeabadb3176232f14e3ad85032e8972581 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 19 Dec 2018 15:40:11 +1300 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 2d48a922..874fbfea 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v3.4.0 -Tue Dec 18 22:45:43 UTC 2018 +tejr dotfiles v3.5.0 +Wed Dec 19 02:40:11 UTC 2018 -- cgit v1.2.3