Merge pull request #276 from sysprog21/refine-dict-check

Enforce consistent dictionary sorting

Author: jserv

scripts/aspell-pws

@@ -168,7 +168,6 @@ kexec
 lchown
 ld
 leetcode
-LeetCode
 lf
 lhs
 lib
@@ -181,12 +180,10 @@ lld
 lldb
 llu
 llx
-llX
 longjmp
 lseek
 lu
 lx
-lX
 macOS
 madvise
 malloc
@@ -230,7 +227,6 @@ pEo
 perf
 pEs
 pf
-pF
 pg
 pGg
 pGp
@@ -239,25 +235,16 @@ phC
 phD
 phN
 piSb
-pISb
 piSc
-pISc
 piSf
-pISf
 piSh
-pISh
 piSl
-pISl
 piSn
-pISn
 piSpc
-pISpc
 pK
 pm
-pM
 pMF
 pmR
-pMR
 pNF
 posix
 pr
@@ -270,11 +257,9 @@ preprocessor
 printf
 proc
 ps
-pS
 pSR
 ptrace
 pUl
-pUL
 putc
 putchar
 putenv

scripts/pre-commit.hook

@@ -223,11 +223,11 @@ if [ "${#SHELL_FILES[@]}" -gt 0 ]; then
 fi
 
 ASPELL_DICT_FILE='scripts/aspell-pws'
-if ! tail -n +2 $ASPELL_DICT_FILE | sort -cdu; then
+if ! LC_ALL=C tail -n +2 $ASPELL_DICT_FILE | sort -f -cdu; then
   throw '%s\n%s\n%s' \
     'Aspell dictionary is unsorted or contains duplicated entries.' \
     'Make sure that by using:' \
-    "    tail -n +2 $ASPELL_DICT_FILE | sort -du"
+    "    tail -n +2 $ASPELL_DICT_FILE | sort -f -du"
 fi
 
 # Show insertion and deletion counts.