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

Change references of many terms to new names

Browse Source 
This is a HUGE commit and this task is not done. There are still some
changes that might need to be discussed and since so much is done here I
think it's better to let this go through and then make sure everything
is okay. When the remaining references are discussed they can also be
changed.

I did NOT include changes in the tmp/OLD_manifest directory.

Some of the changes in this commit (it might be exhaustive but it might
not be - not sure):

- In the Makefiles the WINNERS was renamed AUTHORS.
- References to winners.html were changed to authors.html.
- The FAQ named anchor 'fix_a_winner' was renamed 'fix_an_entry'.
- The JSON fields (or whatever they're called) 'winner_id' and
'winner_JSON_format_version' were changed so that 'winner' is 'entry'.
- In scripts for entries 'IOCCC winner' was changed to 'IOCCC entry'.
- 'winners_text' is now 'entries_text'. It might be better to be
'entry_text' as it's per entry but this was not noticed at first. Since
this is easy to fix I am holding off on this for the meantime.
- The script tmp/update-manifest.sh now has the commit log messages
changed to the correct terms as well.

The index.html files were updated as well with any of the above
changes.

There are some references that should NOT be updated. Two examples
caught (and maybe more have slipped through that will have to be changed
back): in 1984/anonymous/README.md the author wrote back to Landon after
being told about the famous tattoo and they used the words:

    .. my entry will be the first IOCCC winner ..

but since this comes from the author it should remain so.

The other one is that winners.html should still refer to winners.html as
it informs people that it's been moved to authors.html (it does redirect
too but even so if it was changed it would defeat the purpose of the
message).

With paths like authors.html I tried to copy paste so that hopefully
there are no typos. It is possible that I did not end up doing this with
all but these can be fixed when discovered.
This commit is contained in:
Cody Boone Ferguson committed 2024-02-13 07:31:36 -08:00
1 parent 1c258e3df4
commit 205fa25ced
1335 files changed
+3001 -3001
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tmp/check_path_list.sh
+1 -1
View File
@@ -3,7 +3,7 @@
# check_path_list.sh - look for problems with path_list.* files
#
# XXX - This is a temporary utility that will be replaced when
# the .winner.json files are built
# the .entry.json files are built
#
# setup
tmp/echo.sh
+1 -1
View File
@@ -3,7 +3,7 @@
# echo.sh - echo arguments
#
# XXX - This is a temporary utility that will be removed when
# the .winner.json files are built
# the .entry.json files are built
echo "$@"
exit 0
tmp/example.dot_entry.json
+1 -1
View File
@@ -108,7 +108,7 @@
"entry_text" : "list of files that should not be committed under git"
},
{
"file_path" : ".winner.json",
"file_path" : ".entry.json",
"inventory_order" : 4294967295,
"OK_to_edit" : true,
"display_as" : "json",
tmp/fix_csv.sh
+1 -1
View File
@@ -9,7 +9,7 @@
# these issues.
#
# XXX - This is a temporary utility that will be removed when
# the .winner.json files are built
# the .entry.json files are built
# setup
#
tmp/gen_author_json.sh
+1 -1
View File
@@ -6,7 +6,7 @@
# tmp/author_handle.txt and tmp/author.csv and tmp/author-wins.csv.
#
# XXX - This is a temporary utility that will be replaced when
# the .winner.json files are built.
# the .entry.json files are built.
#
# Copyright (c) 2023 by Landon Curt Noll. All Rights Reserved.
#
tmp/gen_entry_json.sh
+7 -7
View File
@@ -294,7 +294,7 @@ declare -a FILE_PATH INVENTORY_ORDER OK_TO_EDIT DISPLAY_AS DISPLAY_VIA_GITHUB WI
#
# process inventory with a numerical inventory_order
#
while IFS=, read -r year dir file_path inventory_order OK_to_edit display_as display_via_github winners_text extra; do
while IFS=, read -r year dir file_path inventory_order OK_to_edit display_as display_via_github entries_text extra; do
# firewall - year dir much match
#
@@ -309,7 +309,7 @@ while IFS=, read -r year dir file_path inventory_order OK_to_edit display_as dis
if [[ $V_FLAG -ge 7 ]]; then
echo "$0: debug[7]: found: year: $year dir: $dir inventory_order: $inventory_order file_path: $file_path" 1>&2
echo "$0: debug[7]: also: display_as: $display_as display_via_github: $display_via_github" 1>&2
echo "$0: debug[7]: and: winners_text: $winners_text extra: $extra" 1>&2
echo "$0: debug[7]: and: entries_text: $entries_text extra: $extra" 1>&2
fi
# firewall - nothing except extra should be empty
@@ -334,8 +334,8 @@ while IFS=, read -r year dir file_path inventory_order OK_to_edit display_as dis
echo "$0: ERROR: ^$YEAR,$WINNER inventory_order: $inventory_order empty display_via_github" 1>&2
exit 38
fi
if [[ -z $winners_text ]]; then
echo "$0: ERROR: ^$YEAR,$WINNER inventory_order: $inventory_order empty winners_text" 1>&2
if [[ -z $entries_text ]]; then
echo "$0: ERROR: ^$YEAR,$WINNER inventory_order: $inventory_order empty entries_text" 1>&2
exit 39
fi
@@ -346,7 +346,7 @@ while IFS=, read -r year dir file_path inventory_order OK_to_edit display_as dis
OK_TO_EDIT+=( "$OK_to_edit" )
DISPLAY_AS+=( "$display_as" )
DISPLAY_VIA_GITHUB+=( "$display_via_github" )
WINNER_TEXT+=( "$winners_text" )
WINNER_TEXT+=( "$entries_text" )
done <<< "$NUMBER_RANKED_MANIFEST_SET"
export FILE_COUNT=${#FILE_PATH[@]}
if [[ $FILE_COUNT -le 0 ]]; then
@@ -406,7 +406,7 @@ for i in "${!INVENTORY_ORDER[@]}"; do
# write OK_to_edit of a given file in manifest of .entry.json
# write display_as of a given file in manifest of .entry.json
# write display_via_github of a given file in manifest of .entry.json
# write winners_text of a given file in manifest of .entry.json
# write entries_text of a given file in manifest of .entry.json
#
cat >> "$TMP_DOT_ENTRY_JSON" << EOF
{
@@ -415,7 +415,7 @@ for i in "${!INVENTORY_ORDER[@]}"; do
"OK_to_edit" : ${OK_TO_EDIT[$i]},
"display_as" : "${DISPLAY_AS[$i]}",
"display_via_github" : ${DISPLAY_VIA_GITHUB[$i]},
"winners_text" : "${WINNER_TEXT[$i]}"
"entries_text" : "${WINNER_TEXT[$i]}"
EOF
# stupid JSON syntax does not allow a trailing comma
tmp/gen_path_list.found.sh
+1 -1
View File
@@ -4,7 +4,7 @@
# directories under a year
#
# XXX - This is a temporary utility that will be replaced when
# the .winner.json files are built.
# the .entry.json files are built.
#
# Copyright (c) 2023 by Landon Curt Noll. All Rights Reserved.
#
tmp/run_all.sh
+1 -1
View File
@@ -3,7 +3,7 @@
# run_all.sh - run a command for all winners
#
# XXX - This is a temporary utility that will be replaced when
# the .winner.json files are built
# the .entry.json files are built
#
# Copyright (c) 2023 by Landon Curt Noll. All Rights Reserved.
#
tmp/things-todo.md
+1 -1
View File
@@ -1,7 +1,7 @@
# A todo list of known things to check and/or do
*Last updated: Sun 04 Feb 2024 17:30:08 UTC*
This document is for [Cody Boone Ferguson](/winners.html#Cody_Boone_Ferguson) as
This document is for [Cody Boone Ferguson](/authors.html#Cody_Boone_Ferguson) as
he (that is I :-) ) wanted a way to keep track of things in a way that did not
require the information getting lost in the thousands of changes in the repo and
because it might be too much to add to the todo list in the issues themselves.
tmp/update-manifest.sh
+10 -10
View File
@@ -242,9 +242,9 @@ else
fi
echo 1>&2
echo "$(basename "$0"): now will run ./run_all.sh -v $CAP_D_FLAG ./gen_winner_json.sh" 1>&2
echo "$(basename "$0"): now will run ./run_all.sh -v $CAP_D_FLAG ./gen_entry.json.sh" 1>&2
echo "NOTE: this step will take a while." 1>&2
if ! ./run_all.sh -v "$CAP_D_FLAG" ./gen_winner_json.sh; then
if ! ./run_all.sh -v "$CAP_D_FLAG" ./gen_entry.json.sh; then
echo "problem with ./run_all.sh, fix manifest and try again." 1>&2
exit 5
fi
@@ -262,7 +262,7 @@ if [[ -n "$A_FLAG" ]]; then
echo "Do you wish to automatically run the commands:" 1>&2
echo " $GIT add -u" 1>&2
echo " $GIT status" 1>&2
echo " $GIT commit -m'update .winner.json files per recent manifest changes'" 1>&2
echo " $GIT commit -m'update .entry.json files per recent manifest changes'" 1>&2
read -r -p "Enter your choice (Y/N): "
if [[ "$REPLY" != "Y" && "$REPLY" != "y" ]]; then
@@ -271,14 +271,14 @@ if [[ -n "$A_FLAG" ]]; then
echo 1>&2
echo " $GIT add -u" 1>&2
echo " $GIT status" 1>&2
echo " $GIT commit -m'update .winner.json files per recent manifest changes'" 1>&2
echo " $GIT commit -m'update .entry.json files per recent manifest changes'" 1>&2
echo 1>&2
read -r -n 1 -p "Press any key when this is done: "
echo 1>&2
else
"$GIT" add -u
"$GIT" status
"$GIT" commit -m'update .winner.json files per recent manifest changes'
"$GIT" commit -m'update .entry.json files per recent manifest changes'
fi
else
echo "Now you should run the following commands in another terminal," 1>&2
@@ -286,7 +286,7 @@ else
echo 1>&2
echo " $GIT add -u" 1>&2
echo " $GIT status" 1>&2
echo " $GIT commit -m'update .winner.json files per recent manifest changes'" 1>&2
echo " $GIT commit -m'update .entry.json files per recent manifest changes'" 1>&2
echo 1>&2
read -r -n 1 -p "Press any key when this is done: "
echo 1>&2
@@ -330,7 +330,7 @@ if [[ -n "$A_FLAG" ]]; then
echo "Do you wish to automatically run the commands:" 1>&2
echo " git add -u" 1>&2
echo " git status" 1>&2
echo " git commit -m'update index.html and .winner.json per recent manifest changes'" 1>&2
echo " git commit -m'update index.html and .entry.json per recent manifest changes'" 1>&2
read -r -p "Enter your choice (Y/N): "
if [[ "$REPLY" != "Y" && "$REPLY" != "y" ]]; then
echo "Now you should run the following commands in another terminal," 1>&2
@@ -338,14 +338,14 @@ if [[ -n "$A_FLAG" ]]; then
echo 1>&2
echo " git add -u" 1>&2
echo " git status" 1>&2
echo " git commit -m'update index.html and .winner.json per recent manifest changes'" 1>&2
echo " git commit -m'update index.html and .entry.json per recent manifest changes'" 1>&2
echo 1>&2
read -r -n 1 -p "Press any key when this is done: "
echo 1>&2
else
"$GIT" add -u
"$GIT" status
"$GIT" commit -m'update index.html and .winner.json per recent manifest changes'
"$GIT" commit -m'update index.html and .entry.json per recent manifest changes'
fi
else
echo "Now you should run the following commands in another terminal," 1>&2
@@ -353,7 +353,7 @@ else
echo 1>&2
echo " git add -u" 1>&2
echo " git status" 1>&2
echo " git commit -m'update index.html and .winner.json per recent manifest changes'" 1>&2
echo " git commit -m'update index.html and .entry.json per recent manifest changes'" 1>&2
echo 1>&2
read -r -n 1 -p "Press any key when this is done: "
echo 1>&2