fix how bin tools sort
We set LC_ALL=C when sorting in a bin tool. This was done to make the result of using `sort(1)` consistent. Improved how the Primary files and Secondary files are sorted by `bin/output-index-inventory.sh` to sort with "-u -k 1n -k 3.2d". The above will change `index.html` files for all entries. Changed `bin/chk-entry.sh` VERSION from "1.1.2 2024-03-17" to "1.1.3 2024-03-18". Changed `bin/gen-authors.sh` VERSION from "1.3 2024-03-04" to "1.3.1 2024-03-18". Changed `bin/gen-location.sh` VERSION from "1.1 2024-03-04" to "1.1.1 2024-03-18". Changed `bin/gen-sitemap.sh` VERSION from "1.3 2024-03-16" to "1.3.1 2024-03-18". Changed `bin/output-index-inventory.sh` VERSION from "1.2 2024-02-27" to "1.2.1 2024-03-18". Changed `bin/pandoc-wrapper.sh` VERSION from "1.5 2024-03-18" to "1.5.1 2024-03-18". Changed `bin/sort.gitignore.sh` VERSION from "1.1.1 2024-02-23" to "1.1.2 2024-03-18". Changed `bin/tar-all.sh` VERSION from "1.1 2024-02-27" to "1.1.1 2024-03-18". Changed `bin/tar-year.sh` VERSION from "1.1 2024-02-27" to "1.1.1 2024-03-18". Performed `make www` to update all entry `index.html` files.
This commit is contained in:
Landon Curt Noll committed
1 parent
b9e2cab574
commit
0833c3e4f0
333 files changed
+767
-775
No files matched your search
+5
-5
@@ -81,7 +81,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
|
||||
|
||||
# set variables referenced in the usage message
|
||||
#
|
||||
export VERSION="1.1.2 2024-03-17"
|
||||
export VERSION="1.1.3 2024-03-18"
|
||||
NAME=$(basename "$0")
|
||||
export NAME
|
||||
export V_FLAG=0
|
||||
@@ -432,10 +432,10 @@ if [[ $status -ne 0 ]]; then
|
||||
echo "$0: ERROR: awk -f $FILELIST_ENTRY_JSON_AWK $ENTRY_JSON > $TMP_MANIFEST_LIST failed, error: $status" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
sort -d -u "$TMP_MANIFEST_LIST" -o "$TMP_MANIFEST_LIST"
|
||||
LC_ALL=C sort -d -u "$TMP_MANIFEST_LIST" -o "$TMP_MANIFEST_LIST"
|
||||
status="$?"
|
||||
if [[ $status -ne 0 ]]; then
|
||||
echo "$0: ERROR: sort -d -u $TMP_MANIFEST_LIST -o $TMP_MANIFEST_LIST failed, error: $status" 1>&2
|
||||
echo "$0: ERROR: LC_ALL=C sort -d -u $TMP_MANIFEST_LIST -o $TMP_MANIFEST_LIST failed, error: $status" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -449,10 +449,10 @@ if [[ $status -ne 0 ]]; then
|
||||
echo "$0: ERROR: find $ENTRY_PATH -type f -print > $TMP_FILE_LIST failed, error: $status" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
sort -d -u "$TMP_FILE_LIST" -o "$TMP_FILE_LIST"
|
||||
LC_ALL=C sort -d -u "$TMP_FILE_LIST" -o "$TMP_FILE_LIST"
|
||||
status="$?"
|
||||
if [[ $status -ne 0 ]]; then
|
||||
echo "$0: ERROR: sort -d -u $TMP_FILE_LIST -o $TMP_FILE_LIST failed, error: $status" 1>&2
|
||||
echo "$0: ERROR: LC_ALL=C sort -d -u $TMP_FILE_LIST -o $TMP_FILE_LIST failed, error: $status" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
+3
-3
@@ -81,7 +81,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
|
||||
|
||||
# set variables referenced in the usage message
|
||||
#
|
||||
export VERSION="1.3 2024-03-04"
|
||||
export VERSION="1.3.1 2024-03-18"
|
||||
NAME=$(basename "$0")
|
||||
export NAME
|
||||
export V_FLAG=0
|
||||
@@ -754,10 +754,10 @@ done >> "$TMP_SORT_WORD"
|
||||
|
||||
# sort the temporary sort word list file
|
||||
#
|
||||
sort -f -d "$TMP_SORT_WORD" -o "$TMP_SORT_WORD"
|
||||
LC_ALL=C sort -f -d "$TMP_SORT_WORD" -o "$TMP_SORT_WORD"
|
||||
status="$?"
|
||||
if [[ $status -ne 0 ]]; then
|
||||
echo "$0: ERROR: sort -f -d $TMP_SORT_WORD -o $TMP_SORT_WORD failed, error: $status" 1>&2
|
||||
echo "$0: ERROR: LC_ALL=C sort -f -d $TMP_SORT_WORD -o $TMP_SORT_WORD failed, error: $status" 1>&2
|
||||
exit 14
|
||||
fi
|
||||
|
||||
|
||||
+3
-3
@@ -81,7 +81,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
|
||||
|
||||
# set variables referenced in the usage message
|
||||
#
|
||||
export VERSION="1.1 2024-03-04"
|
||||
export VERSION="1.1.1 2024-03-18"
|
||||
NAME=$(basename "$0")
|
||||
export NAME
|
||||
export V_FLAG=0
|
||||
@@ -454,7 +454,7 @@ fi
|
||||
find "$AUTHOR_DIR" -mindepth 1 -maxdepth 1 -type f -name '*.json' -print0 |
|
||||
xargs -0 grep '"location_code".*:' |
|
||||
sed -e 's/^.*: "//' -e 's/",*$//' |
|
||||
sort -u |
|
||||
LC_ALL=C sort -u |
|
||||
while read -r LOCATION_CODE; do
|
||||
|
||||
# use the location tool to obtain the location_name
|
||||
@@ -511,7 +511,7 @@ fi
|
||||
echo -n "$AUTHOR_JSON "
|
||||
grep '"sort_word".*:' "$AUTHOR_JSON" | sed -e 's/^.*: "//' -e 's/",*$//'
|
||||
done |
|
||||
sort -k 2d |
|
||||
LC_ALL=C sort -k 2d |
|
||||
while read -r AUTHOR_HANDLE_PATH SORT_WORD; do
|
||||
|
||||
# The author_handle foo_bin is found in author/foo_bar.json
|
||||
|
||||
+4
-4
@@ -81,7 +81,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
|
||||
|
||||
# set variables referenced in the usage message
|
||||
#
|
||||
export VERSION="1.3 2024-03-16"
|
||||
export VERSION="1.3.1 2024-03-18"
|
||||
NAME=$(basename "$0")
|
||||
export NAME
|
||||
export V_FLAG=0
|
||||
@@ -790,10 +790,10 @@ fi
|
||||
|
||||
# sort the manifest list
|
||||
#
|
||||
sort -d -u "$TMP_MANIFEST_LIST" -o "$TMP_MANIFEST_LIST"
|
||||
LC_ALL=C sort -d -u "$TMP_MANIFEST_LIST" -o "$TMP_MANIFEST_LIST"
|
||||
status="$?"
|
||||
if [[ $status -ne 0 ]]; then
|
||||
echo "$0: ERROR: sort -d -u $TMP_MANIFEST_LIST -o $TMP_MANIFEST_LIST failed, error: $status" 1>&2
|
||||
echo "$0: ERROR: LC_ALL=C sort -d -u $TMP_MANIFEST_LIST -o $TMP_MANIFEST_LIST failed, error: $status" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -858,7 +858,7 @@ if [[ -z $NOOP ]]; then
|
||||
|
||||
# output XML for each file in the manifest, in sorted filepath order
|
||||
#
|
||||
sort -d -f -u -t / "$TMP_MANIFEST_LIST" | while read -r FILE_PATH; do
|
||||
LC_ALL=C sort -d -f -u -t / "$TMP_MANIFEST_LIST" | while read -r FILE_PATH; do
|
||||
LASTMOD=$(output_modtime "$FILE_PATH")
|
||||
echo '<url>'
|
||||
echo " <loc>$SITE_URL/$FILE_PATH</loc>"
|
||||
|
||||
@@ -87,7 +87,7 @@ shopt -s globstar # enable '**' to match all files and zero or more directories
|
||||
|
||||
# set variables referenced in the usage message
|
||||
#
|
||||
export VERSION="1.2 2024-02-27"
|
||||
export VERSION="1.2.1 2024-03-18"
|
||||
NAME=$(basename "$0")
|
||||
export NAME
|
||||
export V_FLAG=0
|
||||
@@ -514,11 +514,11 @@ if [[ -z $NOOP ]]; then
|
||||
echo
|
||||
echo '## Primary files'
|
||||
echo
|
||||
grep -E '^[0-9][0-9]{0,8} ' "$TMP_MANIFEST" | sort -n | sed -e 's/^[0-9][0-9]* //'
|
||||
grep -E '^[0-9][0-9]{0,8} ' "$TMP_MANIFEST" | LC_ALL=C sort -u -k 1n -k 3.2d | sed -e 's/^[0-9][0-9]* //'
|
||||
echo
|
||||
echo '## Secondary files'
|
||||
echo
|
||||
grep -E '^[1-9][0-9]{9,} ' "$TMP_MANIFEST" | sort -n | sed -e 's/^[0-9][0-9]* //'
|
||||
grep -E '^[1-9][0-9]{9,} ' "$TMP_MANIFEST" | LC_ALL=C sort -u -k 1n -k 3.2d | sed -e 's/^[0-9][0-9]* //'
|
||||
|
||||
} >> "$TMP_FILE"
|
||||
elif [[ $V_FLAG -ge 3 ]]; then
|
||||
|
||||
@@ -88,7 +88,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
|
||||
|
||||
# set variables referenced in the usage message
|
||||
#
|
||||
export VERSION="1.5 2024-03-18"
|
||||
export VERSION="1.5.1 2024-03-18"
|
||||
NAME=$(basename "$0")
|
||||
export NAME
|
||||
export V_FLAG=0
|
||||
@@ -370,7 +370,8 @@ fi
|
||||
|
||||
# verify that the pandoc version is >= the minimum version
|
||||
#
|
||||
if [[ $(printf "%s\n%s" "$PANDOC_TOOL_VERSION" "$PANDOC_MIN_VERSION" | sort -V | head -1) != "$PANDOC_MIN_VERSION" ]]; then
|
||||
FIRST_VERSION=$(printf "%s\n%s" "$PANDOC_TOOL_VERSION" "$PANDOC_MIN_VERSION" | LC_ALL=C sort -V | head -1)
|
||||
if [[ $FIRST_VERSION != "$PANDOC_MIN_VERSION" ]]; then
|
||||
echo "$0: ERROR: pandoc: $PANDOC_TOOL version: $PANDOC_TOOL_VERSION <=" \
|
||||
"minimum allowed: $PANDOC_MIN_VERSION" 1>&2
|
||||
echo "$0: Warning: pandoc version must be >= $PANDOC_MIN_VERSION" 1>&2
|
||||
|
||||
+1
-1
@@ -47,5 +47,5 @@
|
||||
# Share and enjoy! :-)
|
||||
|
||||
sed -e '/^#/s/.*/0 &/' -e '/^*/s/.*/1 &/' -e '/^[^01*!]/s/.*/2 &/' -e '/^!/s/.*/3 &/' |
|
||||
sort -u -k 1n -k 2d |
|
||||
LC_ALL=C sort -u -k 1n -k 2d |
|
||||
sed 's/[0123] //'
|
||||
@@ -96,7 +96,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
|
||||
|
||||
# set variables referenced in the usage message
|
||||
#
|
||||
export VERSION="1.1.1 2024-02-23"
|
||||
export VERSION="1.1.2 2024-03-18"
|
||||
NAME=$(basename "$0")
|
||||
export NAME
|
||||
export V_FLAG=0
|
||||
|
||||
+3
-3
@@ -81,7 +81,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
|
||||
|
||||
# set variables referenced in the usage message
|
||||
#
|
||||
export VERSION="1.1 2024-02-27"
|
||||
export VERSION="1.1.1 2024-03-18"
|
||||
NAME=$(basename "$0")
|
||||
export NAME
|
||||
export V_FLAG=0
|
||||
@@ -675,10 +675,10 @@ if [[ -z $NOOP ]]; then
|
||||
|
||||
# sort the manifest list
|
||||
#
|
||||
sort -d -u "$TMP_MANIFEST_LIST" -o "$TMP_MANIFEST_LIST"
|
||||
LC_ALL=C sort -d -u "$TMP_MANIFEST_LIST" -o "$TMP_MANIFEST_LIST"
|
||||
status="$?"
|
||||
if [[ $status -ne 0 ]]; then
|
||||
echo "$0: ERROR: sort -d -u $TMP_MANIFEST_LIST -o $TMP_MANIFEST_LIST failed, error: $status" 1>&2
|
||||
echo "$0: ERROR: LC_ALL=C sort -d -u $TMP_MANIFEST_LIST -o $TMP_MANIFEST_LIST failed, error: $status" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
+3
-3
@@ -81,7 +81,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
|
||||
|
||||
# set variables referenced in the usage message
|
||||
#
|
||||
export VERSION="1.1 2024-02-27"
|
||||
export VERSION="1.1.1 2024-03-18"
|
||||
NAME=$(basename "$0")
|
||||
export NAME
|
||||
export V_FLAG=0
|
||||
@@ -542,10 +542,10 @@ if [[ -z $NOOP ]]; then
|
||||
fi
|
||||
echo "$IOCCC_CSS" >> "$TMP_MANIFEST_LIST"
|
||||
echo "$VAR_MK" >> "$TMP_MANIFEST_LIST"
|
||||
sort -d -u "$TMP_MANIFEST_LIST" -o "$TMP_MANIFEST_LIST"
|
||||
LC_ALL=C sort -d -u "$TMP_MANIFEST_LIST" -o "$TMP_MANIFEST_LIST"
|
||||
status="$?"
|
||||
if [[ $status -ne 0 ]]; then
|
||||
echo "$0: ERROR: sort -d -u $TMP_MANIFEST_LIST -o $TMP_MANIFEST_LIST failed, error: $status" 1>&2
|
||||
echo "$0: ERROR: LC_ALL=C sort -d -u $TMP_MANIFEST_LIST -o $TMP_MANIFEST_LIST failed, error: $status" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
elif [[ $V_FLAG -ge 3 ]]; then
|
||||
|
||||
+3
-3
@@ -81,7 +81,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
|
||||
|
||||
# set variables referenced in the usage message
|
||||
#
|
||||
export VERSION="1.1 2024-02-27"
|
||||
export VERSION="1.1.1 2024-03-18"
|
||||
NAME=$(basename "$0")
|
||||
export NAME
|
||||
export V_FLAG=0
|
||||
@@ -647,10 +647,10 @@ if [[ -z $NOOP ]]; then
|
||||
|
||||
# sort the manifest list
|
||||
#
|
||||
sort -d -u "$TMP_MANIFEST_LIST" -o "$TMP_MANIFEST_LIST"
|
||||
LC_ALL=C sort -d -u "$TMP_MANIFEST_LIST" -o "$TMP_MANIFEST_LIST"
|
||||
status="$?"
|
||||
if [[ $status -ne 0 ]]; then
|
||||
echo "$0: ERROR: sort -d -u $TMP_MANIFEST_LIST -o $TMP_MANIFEST_LIST failed, error: $status" 1>&2
|
||||
echo "$0: ERROR: LC_ALL=C sort -d -u $TMP_MANIFEST_LIST -o $TMP_MANIFEST_LIST failed, error: $status" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
Reference in new issue
Block a user