iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shellcheck, remove old files
[distro-setup]
/
brc
diff --git
a/brc
b/brc
index d60af90a674155158c01557efad5eaf143c0c57c..a5c645c52c8fc309e86c20685e07bd4296263643 100644
(file)
--- a/
brc
+++ b/
brc
@@
-2447,20
+2447,14
@@
sk() {
local quotes others ret
quotes=2048,2068,2086,2206,2254
others=2029,2032,2033,2054,2164
local quotes others ret
quotes=2048,2068,2086,2206,2254
others=2029,2032,2033,2054,2164
- # Dont complain about sourced files if we aren't asking for them.
- if [[ $1 != -x ]]; then
- others+=,1091
- fi
- shellcheck -W 999 -e $quotes,$others "$@" || ret=$?
+ shellcheck -x -W 999 -e $quotes,$others "$@" || ret=$?
if (( ret >= 1 )); then
echo "A template comment to disable is now in clipboard. eg: # shellcheck disable=SC2206 # reason"
cbs "# shellcheck disable=SC"
return $ret
fi
}
if (( ret >= 1 )); then
echo "A template comment to disable is now in clipboard. eg: # shellcheck disable=SC2206 # reason"
cbs "# shellcheck disable=SC"
return $ret
fi
}
-skx() {
- sk -x "$@"
-}
+
# sk with quotes. For checking scripts that we expect to take untrusted
# input in order to verify we quoted vars.
skq() {
# sk with quotes. For checking scripts that we expect to take untrusted
# input in order to verify we quoted vars.
skq() {
@@
-2483,7
+2477,7
@@
skmodified() {
# sk on all the files in current git repo (except those excluded)
skgit() {
local f toplevel orig_dir tmp skip pattern
# sk on all the files in current git repo (except those excluded)
skgit() {
local f toplevel orig_dir tmp skip pattern
- local -a ls_files excludes
+ local -a ls_files excludes
sk_files
toplevel=$(git rev-parse --show-toplevel)
if [[ $PWD != "$toplevel" ]]; then
orig_dir=$PWD
toplevel=$(git rev-parse --show-toplevel)
if [[ $PWD != "$toplevel" ]]; then
orig_dir=$PWD
@@
-2491,13
+2485,6
@@
skgit() {
fi
excludes=(
'disabled/*'
fi
excludes=(
'disabled/*'
- # sourced from brc2
- beet-data
- # sourced from .bash_profile
- .bashrc
- )
- no_check_sourced=(
- .bash_profile
)
tmp=$(git ls-files | shuf)
mapfile -t ls_files <<<"$tmp"
)
tmp=$(git ls-files | shuf)
mapfile -t ls_files <<<"$tmp"
@@
-2510,19
+2497,11
@@
skgit() {
fi
done
if $skip; then continue; fi
fi
done
if $skip; then continue; fi
-
- check_source=-a
- for pattern in "${no_check_sourced[@]}"; do
- if [[ $f == "$pattern" ]]; then
- check_source=
- break
- fi
- done
if sk-p "$f"; then
if sk-p "$f"; then
- printf "================= %s\n" "$f"
- sk $check_source --color=always $f || [[ $? == 1 ]]
+ sk_files+=("$f")
fi
done
fi
done
+ sk "${sk_files[@]}"
if [[ $orig_dir ]]; then
cd $orig_dir
fi
if [[ $orig_dir ]]; then
cd $orig_dir
fi