mirror/ioccc
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix chk-entry and sorting

Browse Source 
Use of `sort(1)` with -u appears to be problematic.
As an example, using `sort -d -u` for both "c11" and "c++11"
will produce only "c11".  This where we do not strictly
need to do so, we do not use -u with `sort(1)`.

With the above, fixed `bin/chk-entry.sh -v 3 2018/burton2`
under Linux.

Changed `bin/chk-entry.sh` VERSION from "1.1.4 2024-03-26"
to "1.1.5 2024-03-27".

Changed `bin/gen-sitemap.sh` VERSION from "1.3.3 2024-03-26"
to "1.3.4 2024-03-27".

Changed `bin/output-index-inventory.sh` VERSION from "1.2.3 2024-03-26"
to "1.2.4 2024-03-27".

Changed `bin/tar-all.sh` VERSION from "1.1.2 2024-03-26"
to "1.1.3 2024-03-27".

Changed `bin/tar-year.sh` VERSION from "1.1.2 2024-03-26"
to "1.1.3 2024-03-27".

Ran `make www` to test the above.  The `index.html` for the
`2018/burton2` entry was updated.

Ran `make form_entry_tarball` to test the above.  Some recently
updated entries plus the `2018/burton2` entry was updated.

TODO: Test the results under Linux.

TODO: Update `bin/tar-year.sh`.  Update year level compressed tarballs.

TODO: Update `bin/tar-all.sh`.  Update top level compressed tarball.

TODO: Write `bin/untar-year.sh` and `bin/untar-all.sh`.
This commit is contained in:
Landon Curt Noll committed 2024-03-27 02:03:28 -07:00
1 parent c176b51cec
commit 73f41e9c74
16 files changed
+37 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bin/tar-entry.sh
+4 -4
View File
@@ -83,7 +83,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.2 2024-03-26"
export VERSION="1.3.3 2024-03-27"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -626,10 +626,10 @@ if [[ -z $NOOP ]]; then
fi
echo "$IOCCC_CSS" >> "$TMP_MANIFEST_LIST"
echo "$VAR_MK" >> "$TMP_MANIFEST_LIST"
LC_ALL=C sort -d -u "$TMP_MANIFEST_LIST" -o "$TMP_MANIFEST_LIST"
LC_ALL=C sort -d "$TMP_MANIFEST_LIST" -o "$TMP_MANIFEST_LIST"
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: ERROR: LC_ALL=C sort -d -u $TMP_MANIFEST_LIST -o $TMP_MANIFEST_LIST failed, error: $status" 1>&2
echo "$0: ERROR: LC_ALL=C sort -d $TMP_MANIFEST_LIST -o $TMP_MANIFEST_LIST failed, error: $status" 1>&2
exit 1
fi
elif [[ $V_FLAG -ge 3 ]]; then
@@ -739,7 +739,7 @@ if [[ -z $REBUILD_TARBALL ]]; then
fi
fi
if [[ -z $REBUILD_TARBALL ]]; then
LC_ALL=C sort -d -u "$TMP_TARBALL_LIST" -o "$TMP_TARBALL_LIST"
LC_ALL=C sort -d "$TMP_TARBALL_LIST" -o "$TMP_TARBALL_LIST"
status="$?"
if [[ $status -ne 0 ]]; then
REBUILD_TARBALL="true"