From a78d78ccff045fa4d7069e87dcd2d58405358043 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Thu, 30 May 2024 11:17:04 -0700 Subject: [PATCH] fix use of temp-test-ioccc Regarding use of `temp-test-ioccc` in current repo files: We will ignore files under `tmp/` as they are going away. We will ignore files under `bin/` as they will have their default `REPO_URL` value changed during the later parts of the **Great Fork Merge**. We will ignore `*.html` files as the above changes to `bin/` tool will also change them during the later parts of the **Great Fork Merge**. We will ignore `sitemap.xml` as the it will change during the later parts of the **Great Fork Merge**. So this leaves for our consideration the files printed by this command: ```sh find * -type f ! -name '*.html' ! -name sitemap.xml ! -path 'tmp/*' ! -path 'bin/*' -print0 | xargs -0 grep -l 'temp-test-ioccc' ``` We see 5 (3 sir), 3 cases: * README.md index.md The reference to `temp-test-ioccc` will be removed when a given section goes away as part of the later parts of the **Great Fork Merge**. Nothing needs to be dome here other than to add some **XXX** comments to help remind us of what needs to be done in later parts of the **Great Fork Merge**. * bugs.md faq.md news.md var.mk The use of `temp-test-ioccc` is outside of a blob. Here `https://github.com/ioccc-src/temp-test-ioccc/` may be be replaced by `https://github.com/ioccc-src/winner/` in anticipation of the **Great Fork Merge**. There is an exception: The historic discussion abouts the history of the `temp-test-ioccc` repo needs to retain their `https://github.com/ioccc-src/temp-test-ioccc/` strings in `faq.md` and `news.md`. * 2005/sykes/README.md The markdown links that start with `https://github.com/ioccc-src/temp-test-ioccc/blob/master/` should instead start with `%%REPO_URL%%/`. After the **Great Fork Merge**, the `%%REPO_URL%%/` value will refer to `https://github.com/ioccc-src/winner/blob/master/` instead. * 2020/ferguson1/snake.1 There is not a tool to "pre-process" cat pages like there is for markdown files: no should there be. The cat page refers to a markdown file when instead it should refer to a HTML page. In this case we suggest that `https://github.com/ioccc-src/temp-test-ioccc/blob/` be replaced by `https://www.isthe.com/`, and `.md` be replaced by `.html` in anticipation of what it will need to be after the **Great Fork Merge**. * YYYY/entry_dir/*.sh The shell scripts references by the above command are "helper shell scripts. Like man pages, there is no "pre-processor" for shell scripts, nor should there be. Looking at these helper shell script files in detail: ```sh find * -name '*.sh' ! -path 'tmp/*' ! -path 'bin/*' -print0 | xargs -0 grep 'temp-test-ioccc/blob/master' ``` We see that they all make references to `faq.md#something.`. This is wrong in 2 ways: 0) They should not refer to the markdown file `faq.md` but rather to the HTML file `faq.html`. 1) They punctuate a literal string (with one exception) by adding a final period (".") to a string that requires somebody to copy and paste and exclude the final period ("."). Since these echo commands are suggesting that the user view something within the FAQ, we recommend that `echo "Tip: see https://github.com/ioccc-src/temp-test-ioccc/blob/master/faq.md#` be replaced by `echo "Tip: see https://www.ioccc.org/faq.html#` AND that the final period (".") be removed. Thus they too will anticipate what they will need to be after the **Great Fork Merge**. --- 2001/coupard/try.sh | 2 +- 2005/boutines/try.sh | 2 +- 2005/sykes/README.md | 6 +++--- 2013/endoh3/try.sh | 2 +- 2018/algmyr/try.sh | 2 +- 2018/bellard/try.sh | 4 ++-- 2019/giles/try.sh | 2 +- 2020/ferguson1/snake.1 | 8 ++++---- 2020/giles/try.sh | 6 +++--- 2020/kurdyukov2/makegif.sh | 4 ++-- 2020/kurdyukov2/try.sh | 4 ++-- README.html | 6 +++--- README.md | 9 ++++----- bugs.html | 6 +++--- bugs.md | 6 +++--- faq.html | 38 +++++++++++++++++++------------------- faq.md | 38 +++++++++++++++++++------------------- index.html | 3 +++ index.md | 3 +++ var.mk | 2 +- 20 files changed, 79 insertions(+), 74 deletions(-) diff --git a/2001/coupard/try.sh b/2001/coupard/try.sh index dd0fc315a..65e6b7e55 100755 --- a/2001/coupard/try.sh +++ b/2001/coupard/try.sh @@ -32,5 +32,5 @@ elif [[ -S "$DSP" ]]; then ./coupard > "$DSP" else echo "SoX not installed. Please install it and try again." 1>&2 - echo "Tip: see https://github.com/ioccc-src/temp-test-ioccc/blob/master/faq.md#sox." 1>&2 + echo "Tip: visit: https://www.ioccc.org/faq.html#sox" 1>&2 fi diff --git a/2005/boutines/try.sh b/2005/boutines/try.sh index 0c957e71d..80334aab2 100755 --- a/2005/boutines/try.sh +++ b/2005/boutines/try.sh @@ -65,5 +65,5 @@ else echo 1>&2 echo "convert not found (ImageMagick not installed?)" 1>&2 echo "Try viewing *.svg with a graphics viewer that can view SVG files." 1>&2 - echo "Tip: see https://github.com/ioccc-src/temp-test-ioccc/blob/master/faq.md#imagemagick." 1>&2 + echo "Tip: visit: https://www.ioccc.org/faq.html#imagemagick" 1>&2 fi diff --git a/2005/sykes/README.md b/2005/sykes/README.md index ed8b454fa..f217ef689 100644 --- a/2005/sykes/README.md +++ b/2005/sykes/README.md @@ -37,7 +37,7 @@ For those who fondly remember their first down memory lane ... starting with `$C000` of course! We encourage you to try and grok the obfuscated expression on [line -56](https://github.com/ioccc-src/temp-test-ioccc/blob/master/2005/sykes/sykes.c#L56), +56](%%REPO_URL%%/2005/sykes/sykes.c#L56), after the C pre-processor gets finished with it! We downloaded the [ROM](https://en.wikipedia.org/wiki/ROM_image) contents to use @@ -258,13 +258,13 @@ mode. Otherwise some PET specific features are skipped during normal The main processing all happens in a heroic expression containing no less than 64 ternary operators (after `cpp`) starting on [line -56](https://github.com/ioccc-src/temp-test-ioccc/blob/master/2005/sykes/sykes.c#L56). +56](%%REPO_URL%%/2005/sykes/sykes.c#L56). This decodes the [6502](https://en.wikipedia.org/wiki/MOS_Technology_6502#Technical_description) instructions according to a table and executes them. The addressing mode is decoded in a similar expression starting on [line -53](https://github.com/ioccc-src/temp-test-ioccc/blob/master/2005/sykes/sykes.c#L53). +53](%%REPO_URL%%/2005/sykes/sykes.c#L53). ### Bugs diff --git a/2013/endoh3/try.sh b/2013/endoh3/try.sh index 7d8add7c3..370d0e45b 100755 --- a/2013/endoh3/try.sh +++ b/2013/endoh3/try.sh @@ -76,7 +76,7 @@ endoh3() echo 1>&2 else echo "Please install either SoX, ruby or padsp (from PulseAudio)." 1>&2 - echo "Tip: see https://github.com/ioccc-src/temp-test-ioccc/blob/master/faq.md#sox." 1>&2 + echo "Tip: visit: https://www.ioccc.org/faq.html#sox" 1>&2 exit 1 fi fi diff --git a/2018/algmyr/try.sh b/2018/algmyr/try.sh index 4eaf6856b..a578f0fc6 100755 --- a/2018/algmyr/try.sh +++ b/2018/algmyr/try.sh @@ -31,7 +31,7 @@ SOX="$(type -P sox)" if [[ -z "$SOX" && -z "$APLAY" ]]; then echo "Missing both sox and aplay, cannot do this step." 1>&2 - echo "NOTE: see https://github.com/ioccc-src/temp-test-ioccc/blob/master/faq.md#sox." 1>&2 + echo "Tip: visit: https://www.ioccc.org/faq.html#sox" 1>&2 elif [[ -n "$SOX" ]]; then echo "$ echo -n ' MENE MENE TEKEL UPHARSIN ' | ./prog | \ $SOX -t raw -c 1 -r 44100 -L -e floating-point -b 32 \ diff --git a/2018/bellard/try.sh b/2018/bellard/try.sh index 85701ec0a..413d619b3 100755 --- a/2018/bellard/try.sh +++ b/2018/bellard/try.sh @@ -40,12 +40,12 @@ elif [[ -n "$PNGTOPNM" && -n "$PNMSCALE" && -n "$CJPEG" ]]; then else if [[ -z "$PNGTOPAM" || -z "$PNGTOPNM" || "$PNMSCALE" ]]; then echo "Cannot find pngtopam(1) or pnmscale(1). Try installing netpbm first." 1>&2 - echo "See https://github.com/ioccc-src/temp-test-ioccc/blob/master/faq.md#netpbm" 1>&2 + echo "Tip: visit: https://www.ioccc.org/faq.html#netpbm" 1>&2 echo 1>&2 fi if [[ -z "$CJPEG" ]]; then echo "Cannot find cjpeg. Try installing libjpeg-turbo." 1>&2 - echo "See https://github.com/ioccc-src/temp-test-ioccc/blob/master/faq.md#libjpeg." 1>&2 + echo "Tip: visit: https://www.ioccc.org/faq.html#libjpeg" 1>&2 echo 1>&2 fi fi diff --git a/2019/giles/try.sh b/2019/giles/try.sh index 2c11720d6..f26552720 100755 --- a/2019/giles/try.sh +++ b/2019/giles/try.sh @@ -35,6 +35,6 @@ if [[ -n "$PLAY" ]]; then echo 1>&2 else echo "play(1) from SoX not installed." 1>&2 - echo "NOTE: see https://github.com/ioccc-src/temp-test-ioccc/blob/master/faq.md#sox." 1>&2 + echo "Tip: visit: https://www.ioccc.org/faq.html#sox" 1>&2 fi diff --git a/2020/ferguson1/snake.1 b/2020/ferguson1/snake.1 index 1dbff7495..07b2b2aca 100644 --- a/2020/ferguson1/snake.1 +++ b/2020/ferguson1/snake.1 @@ -77,7 +77,7 @@ you grow to the full size! Size to grow every time you eat a bug. Default 5; can be negative. "Negativity" creates for fun gameplay modes with enough creativity. -See \fB\\fP for some examples. +See \fB\\fP for some examples. \fIplay.sh\fP allows you to reconfigure the colours and play different pre\-configured gameplay modes. .TQ .B SHED @@ -109,7 +109,7 @@ or See .I play.sh and -.I \ +.I \ for examples. .sp .RS @@ -229,7 +229,7 @@ The shed snakeskin is not an obstacle but walls can be and so can the snake itse Also snakes grow by moulting (technical term for shedding) so when the snake leaves its snakeskin behind it really ought to grow but instead it shrinks; this means negative shedding ought to have the snake grow and positive shedding have the snake - what? It's a misnomer: it took fewer bytes and the negative shedding is a positive consequence of unsigned arithmetic. .PP -On a more serious note see \fB\\fP. +On a more serious note see \fB\\fP. .SH EXAMPLES .PP Test your terminal capabilities and get other various data (based on dimensions of terminal, growth size, size and max size as specified i.e. you can pass in the variables \fBLINES\fP, \fBCOLUMNS\fP, \fBMAXSIZE\fP, \fBGROW\fP and \fBSIZE\fp): @@ -279,7 +279,7 @@ That will compile the game to be the colours you select and then enable cannibal .PP For many more gameplay information, modes and features check: .br -\fB\\fP +\fB\\fP and for an interactive script that prompts for some of those modes see the \fIplay.sh\fP script. .SH AUTHOR Written by Cody Boone Ferguson for IOCCC 2020 (the 27th IOCCC). diff --git a/2020/giles/try.sh b/2020/giles/try.sh index 9b47b8981..06f781a66 100755 --- a/2020/giles/try.sh +++ b/2020/giles/try.sh @@ -25,7 +25,7 @@ if [[ -z "$PLAY" ]]; then echo "Note: cannot find play(1) or aplay(1). Will not play sounds for you. Try installing" 1>&2 echo "SoX. You will have to play the WAV output manually, sorry." 1>&2 echo 1>&2 - echo "Tip: see https://github.com/ioccc-src/temp-test-ioccc/blob/master/faq.md#sox." 1>&2 + echo "Tip: visit: https://www.ioccc.org/faq.html#sox" 1>&2 echo 1>&2 fi fi @@ -40,7 +40,7 @@ if [[ -n "$PLAY" ]]; then else echo "Please play pi.wav in an audio player that can play WAV files." 1>&2 echo 1>&2 - echo "Tip: see https://github.com/ioccc-src/temp-test-ioccc/blob/master/faq.md#sox." 1>&2 + echo "Tip: visit: https://www.ioccc.org/faq.html#sox" 1>&2 echo 1>&2 fi @@ -60,7 +60,7 @@ else echo 1>&2 echo "Please play jenny.wav with an audio player that can play WAV files." echo 1>&2 - echo "Tip: see https://github.com/ioccc-src/temp-test-ioccc/blob/master/faq.md#sox." 1>&2 + echo "Tip: visit: https://www.ioccc.org/faq.html#sox" 1>&2 echo 1>&2 read -r -n 1 -p "Press any key to convert 10666-28 ('IOCCC-28'): " echo 1>&2 diff --git a/2020/kurdyukov2/makegif.sh b/2020/kurdyukov2/makegif.sh index 8fcaf7885..c947db6cc 100755 --- a/2020/kurdyukov2/makegif.sh +++ b/2020/kurdyukov2/makegif.sh @@ -42,7 +42,7 @@ convert_error() { echo 1>&2 echo "Warning: $CONVERT failed to generate out.gif. Is $CONVERT convert(1) from ImageMagick?" 1>&2 - echo "See: https://github.com/ioccc-src/temp-test-ioccc/blob/master/faq.md#imagemagick." 1>&2 + echo "Tip: visit: https://www.ioccc.org/faq.html#imagemagick" 1>&2 echo 1>&2 echo "Tip: if you have it in a different path, try: CONVERT=path ./try.sh" 1>&2 echo 1>&2 @@ -51,7 +51,7 @@ convert_error() if [[ -z "$CONVERT" || ! -f "$CONVERT" || ! -x "$CONVERT" ]]; then echo 1>&2 echo "Could not fine convert(1) from ImageMagick." 1>&2 - echo "See: https://github.com/ioccc-src/temp-test-ioccc/blob/master/faq.md#imagemagick." 1>&2 + echo "Tip: visit: https://www.ioccc.org/faq.html#imagemagick" 1>&2 echo 1>&2 else "$CONVERT" -delay 10 -dither none -loop 0 "${list[@]}" +map "$output" diff --git a/2020/kurdyukov2/try.sh b/2020/kurdyukov2/try.sh index 0329fb1a8..6226b1639 100755 --- a/2020/kurdyukov2/try.sh +++ b/2020/kurdyukov2/try.sh @@ -21,7 +21,7 @@ convert_error() { echo 1>&2 echo "Warning: $CONVERT failed to generate out.gif. Is $CONVERT convert(1) from ImageMagick?" 1>&2 - echo "See: https://github.com/ioccc-src/temp-test-ioccc/blob/master/faq.md#imagemagick." 1>&2 + echo "Tip: visit: https://www.ioccc.org/faq.html#imagemagick" 1>&2 echo 1>&2 echo "Tip: if you have it in a different path, try: CONVERT=path ./try.sh" 1>&2 echo 1>&2 @@ -78,6 +78,6 @@ if [[ -n "$CONVERT" ]]; then else echo 1>&2 echo "Could not fine convert(1) from ImageMagick." 1>&2 - echo "See: https://github.com/ioccc-src/temp-test-ioccc/blob/master/faq.md#imagemagick." 1>&2 + echo "Tip: visit: https://www.ioccc.org/faq.html#imagemagick" 1>&2 echo 1>&2 fi diff --git a/README.html b/README.html index 10400e20d..d8a285d24 100644 --- a/README.html +++ b/README.html @@ -382,6 +382,7 @@ +

This is NOT the official IOCCC web site!

Please visit www.ioccc.org for the official IOCCC web site.

Please do NOT bookmark or link to this experimental web site.

@@ -392,9 +393,8 @@ broken links, typos and other problems. If you wish to recommend changes (understanding that things may be rapidly changing out from under your copy), then consider making pull requests against the temp-test-ioccc GitHub repo.

-

XXX - The text from the top down to the What follows is the actual README.md file -line will be removed when this web site becomes official - XXX

-

What follows is the actual README.md file - Remove from top down through this line - XXX

+

What follows is the actual README.md file

+

The International Obfuscated C Code Contest

Obfuscate | verb [with object]

    diff --git a/README.md b/README.md index dd42b004e..7fda3d377 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ + ### This is NOT the official IOCCC web site! Please visit [www.ioccc.org](https://www.ioccc.org) for the official **IOCCC** web site. @@ -14,13 +15,11 @@ changes (understanding that things may be rapidly changing out from under your copy), then consider making pull requests against the temp-test-ioccc GitHub repo. -XXX - The text from the top down to the _What follows is the actual README.md file_ -line will be removed when this web site becomes official - XXX - - -## What follows is the actual README.md file - Remove from top down through this line - XXX + +### What follows is the actual README.md file + # The International Obfuscated C Code Contest ## **Obfuscate** | *verb* [with object] diff --git a/bugs.html b/bugs.html index ffa795628..ce93ef00c 100644 --- a/bugs.html +++ b/bugs.html @@ -391,10 +391,10 @@ attempt to port older code to more modern environments introduced bugs.

    The following is a known list of BUGS and (mis)FEATURES in IOCCC entries.

    Can you fix/improve entries not under the INABIAF (it’s not a bug it’s a feature)? You are VERY WELCOME to try.

    -

    As far as how to help: please submit your fixes in a GitHub pull +

    As far as how to help: please submit your fixes in a GitHub pull request (with ONE PULL REQUEST PER FIX, please)!

    -

    We will be happy to credit anyone who submits successful GitHub pull +

    We will be happy to credit anyone who submits successful GitHub pull requests in the thanks file. If you’re the author of an entry that win the IOCCC, we will add a link to your winning entries in the file @@ -3300,7 +3300,7 @@ for now we wish everyone a happy new year!

    We hope this document was of use to you in determining which entries are known to have a problem, what entries are known to have features that are not bugs and so on. We also thank you for going through this document and, if you propose any -fixes] via a GitHub pull +fixes] via a GitHub pull request or otherwise, we thank you as well for the help! We will happily add you to the thanks file as well.

    diff --git a/bugs.md b/bugs.md index c6c06c89f..a1b6247ca 100644 --- a/bugs.md +++ b/bugs.md @@ -12,11 +12,11 @@ Can you fix/improve entries not under the INABIAF (it's not a bug it's a feature)? You are **VERY WELCOME** to try. As far as how to help: please submit your fixes in a [GitHub pull -request](https://github.com/ioccc-src/temp-test-ioccc/pulls) (with ONE PULL +request](https://github.com/ioccc-src/winner/pulls) (with ONE PULL REQUEST *PER* FIX, please)! We will be **happy to credit anyone who submits successful [GitHub pull -requests](https://github.com/ioccc-src/temp-test-ioccc/pulls)** in the +requests](https://github.com/ioccc-src/winner/pulls)** in the [thanks](thanks-for-help.html) file. If you're the author of an entry that win the IOCCC, we will add a link to your winning entries in the file (if you're not an author, we can add a link to your GitHub page or personal @@ -4231,7 +4231,7 @@ We hope this document was of use to you in determining which entries are known to have a problem, what entries are known to have features that are not bugs and so on. We also thank you for going through this document and, if you propose any fixes] via a [GitHub pull -request](https://github.com/ioccc-src/temp-test-ioccc/pulls) or otherwise, we +request](https://github.com/ioccc-src/winner/pulls) or otherwise, we thank you as well for the help! We will happily add you to the [thanks](thanks-for-help.html) file as well. diff --git a/faq.html b/faq.html index cc7267211..d5c28d284 100644 --- a/faq.html +++ b/faq.html @@ -382,7 +382,7 @@ -

    FAQ Table of Contents

    +

    FAQ Table of Contents

    Section 0 - Submitting entries to a new IOCCC

    • 0.0 - How may I submit to the IOCCC?
      • @@ -708,10 +708,10 @@ rules, IOCCC guidelines and on the IOCCC mkiocccentry tools.

      To comment on the IOCCC rules or the IOCCC guidelines please view the -GitHub discussions for this repo. +GitHub discussions for this repo. If there is an on-going discussion that seems relevant to what you have to say, consider adding comments to that particular discussion. -Otherwise consider opening a new IOCCC repo +Otherwise consider opening a new IOCCC repo discussion.

      To comment on IOCCC mkiocccentry tools, please view the mkiocccentry repo discussions. @@ -946,7 +946,7 @@ files) that is more consistent across IOCCC years.

    • Generating HTML content from markdown files and JSON data files via a set of tools and scripts.
    • Setting up a system whereby authors of IOCCC entries may update their own -contact information via a GitHub pull +contact information via a GitHub pull request.
    • Setting up to generate the top level years.html file via the gen-years.sh tool.
      • @@ -1656,7 +1656,7 @@ known and we are looking for someone to attempt to fix it.

      that you may wish to try.

      It also possible that you may have discovered a bug in an winning IOCCC entry. If so, you are invited to try an fix the IOCCC entry and -submit that fix by way of a GitHub pull +submit that fix by way of a GitHub pull request. Please see FAQ 5.2 for how to submit a fix to an IOCCC entry.

      @@ -2045,7 +2045,7 @@ section may offer you important fixing clues.

      We do not ‘maintain’ the contest entries as such. The code is made available on an ‘AS -IS’ basis. If you have a FIX for an entry, we suggest that you submit your fixes in a GitHub pull +IS’ basis. If you have a FIX for an entry, we suggest that you submit your fixes in a GitHub pull request as we welcome pull requests that have a minimal impact on the entry while improving the portability, functionality, and/or addressing known problems.

      If you do submit a pull request, we ask that each pull request address just one IOCCC entry at a time.

      @@ -2728,8 +2728,8 @@ have to be logged into your account.

      • Creating a GitHub account
      • Installing an ssh key to GitHub
        • -
      • Forking the temp-test-ioccc repo
        • -
      • Cloning the temp-test-ioccc repo
        • +
      • Forking the IOCCC winner repo
        • +
      • Cloning the IOCCC winner repo
      • Making changes, fixes etc.
      • Committing your changes
      • Opening a pull request
        • @@ -2760,18 +2760,18 @@ GitHub, it could be anything you wish, as long as it’s in ~/.ssh. it might be ~/.ssh/github.pub.

        Whatever the key file is, copy the contents and paste it into the GitHub field labelled Key. Once you have done so click on Add SSH key.

        -

        Forking the temp-test-ioccc repo

        +

        Forking the IOCCC winner repo

        Open in your browser the link: -https://github.com/ioccc-src/temp-test-ioccc/fork. You now should follow the +https://github.com/ioccc-src/winner/fork. You now should follow the instructions in forking the repo.

        -

        Cloning the temp-test-ioccc repo

        +

        Cloning the IOCCC winner repo

        Once you have forked the repo you are ready to clone it to your system. For instance Cody Boone Ferguson has the GitHub handle xexyl so he would type in:

        -
            git clone https://github.com/xexyl/temp-test-ioccc [target_dir]
        +
            git clone https://github.com/xexyl/winner [target_dir]

        Once that is completed you will need to change to that directory. The default directory would be the name of the repo but if you specified a target directory it will be that. For instance using the above example you might do:

        -
            cd temp-test-ioccc
        +
            cd winner

        You’re ready to make your changes now!

        Making changes, fixes etc.

        Here you must use your wits, knowledge, creativity and whatever else you have. @@ -2803,8 +2803,8 @@ with your ssh key. To do this you need to do:

        Hi xexyl! You’ve successfully authenticated, but GitHub does not provide shell access.

        Now, assuming that the forked repo is -https://github.com/xexyl/temp-test-ioccc, you’d type:

        -
            git remote set-url origin git@github.com:xexyl/temp-test-ioccc.git
        +https://github.com/xexyl/winner, you’d type:

        +
            git remote set-url origin git@github.com:xexyl/winner.git

        Now you’d be ready to make your commits.

        Before doing anything else, however, a new branch needs to be created. Continuing the example above for @@ -2840,16 +2840,16 @@ warrant the log:

        remote: Resolving deltas: 100% (4/4), completed with 4 local objects. remote: remote: Create a pull request for 'human-snakes' on GitHub by visiting: - remote: https://github.com/xexyl/temp-test-ioccc/pull/new/human-snakes + remote: https://github.com/xexyl/winner/pull/new/human-snakes remote: - To github.com:xexyl/temp-test-ioccc.git + To github.com:xexyl/winner.git * [new branch] human-snakes -> human-snakes branch 'human-snakes' set up to track 'origin/human-snakes'.

        The link referred to above would then be opened to open a pull request. Just follow the instructions at this point. If however it does not show a link it is likely because the branch already exists in your GitHub account (for the repo). In this case you can open the link: -https://github.com/ioccc-src/temp-test-ioccc/pulls which might show something +https://github.com/ioccc-src/winner/pulls which might show something like:

            xexyl:human-snakes had recent pushes 1 minute ago

        and to the right of it you would see a button that says Compare & pull request @@ -2875,7 +2875,7 @@ in the matter.

        When the judges have merged the pull request you now need to make sure your fork has the merge. To do this from the command line, assuming the fork in the above example, you would type:

        -
            git checkout master && git pull https://github.com/ioccc-src/temp-test-ioccc.git master && git push origin master
        +
            git checkout master && git pull https://github.com/ioccc-src/winner.git master && git push origin master

        This will merge your pull request to your fork.

        diff --git a/faq.md b/faq.md index ad2cc0aff..1d3dc5197 100644 --- a/faq.md +++ b/faq.md @@ -1,4 +1,4 @@ -# FAQ Table of Contents +# FAQ Table of Contents ## Section 0 - [Submitting entries to a new IOCCC](#faq0) @@ -435,11 +435,11 @@ and on the [IOCCC mkiocccentry tools](https://github.com/ioccc-src/mkiocccentry) To comment on the [IOCCC rules](next/rules.html) or the [IOCCC guidelines](next/guidelines.html) please view the -[GitHub discussions for this repo](https://github.com/ioccc-src/temp-test-ioccc/discussions). +[GitHub discussions for this repo](https://github.com/ioccc-src/winner/discussions). If there is an on-going discussion that seems relevant to what you have to say, consider adding comments to that particular discussion. Otherwise consider opening a [new IOCCC repo -discussion](https://github.com/ioccc-src/temp-test-ioccc/discussions/new/choose). +discussion](https://github.com/ioccc-src/winner/discussions/new/choose). To comment on [IOCCC mkiocccentry tools](https://github.com/ioccc-src/mkiocccentry), please view the [mkiocccentry repo discussions](https://github.com/ioccc-src/mkiocccentry/discussions). @@ -742,7 +742,7 @@ files) that is more consistent across IOCCC years. tools and scripts](bin/index.html). * Setting up a system whereby authors of IOCCC entries may update their own contact information via a [GitHub pull -request](https://github.com/ioccc-src/temp-test-ioccc/pulls). +request](https://github.com/ioccc-src/winner/pulls). * Setting up to generate the top level [years.html](years.html) file via the [gen-years.sh](%%REPO_URL%%/bin/gen-years.sh) tool. * Setting up to generate the top level [authors.html file](authors.html), renamed @@ -1803,7 +1803,7 @@ that you may wish to try. It also possible that you may have discovered a bug in an winning IOCCC entry. If so, you are invited to try an fix the IOCCC entry and submit that fix by way of a [GitHub pull -request](https://github.com/ioccc-src/temp-test-ioccc/pulls). +request](https://github.com/ioccc-src/winner/pulls). Please see [FAQ 5.2](#fix_an_entry) for how to submit a fix to an IOCCC entry. @@ -2444,7 +2444,7 @@ section may offer you important fixing clues. We do not 'maintain' the contest entries as such. The code is made available on an 'AS IS' basis. If you have a FIX for an entry, we suggest that you submit your fixes in a [GitHub pull -request](https://github.com/ioccc-src/temp-test-ioccc/pulls) as we welcome pull requests that have a +request](https://github.com/ioccc-src/winner/pulls) as we welcome pull requests that have a minimal impact on the entry while improving the portability, functionality, and/or addressing known problems. If you do submit a pull request, we ask that each pull request address just one IOCCC entry at a time. @@ -3505,8 +3505,8 @@ To help you out here is a navigation menu in this FAQ entry: - [Creating a GitHub account](#creating-a-github-account) - [Installing an ssh key to GitHub](#installing-an-ssh-key) -- [Forking the temp-test-ioccc repo](#forking-the-temp-test-ioccc-repo) -- [Cloning the temp-test-ioccc repo](#cloning-the-temp-test-ioccc-repo) +- [Forking the IOCCC winner repo](#forking-the-ioccc-winner-repo) +- [Cloning the IOCCC winner repo](#cloning-the-ioccc-winner-repo) - [Making changes, fixes etc.](#making-changes-fixes-etc) - [Committing your changes](#committing-your-changes) - [Opening a pull request](#opening-a-pull-request) @@ -3549,20 +3549,20 @@ it might be `~/.ssh/github.pub`. Whatever the key file is, copy the contents and paste it into the GitHub field labelled _Key_. Once you have done so click on _Add SSH key_. -#### Forking the temp-test-ioccc repo +#### Forking the IOCCC winner repo Open in your browser the link: -. You now should follow the +. You now should follow the instructions in forking the repo. -#### Cloning the temp-test-ioccc repo +#### Cloning the IOCCC winner repo Once you have forked the repo you are ready to clone it to your system. For instance Cody Boone Ferguson has the GitHub handle _xexyl_ so he would type in: ``` - git clone https://github.com/xexyl/temp-test-ioccc [target_dir] + git clone https://github.com/xexyl/winner [target_dir] ``` Once that is completed you will need to change to that directory. The default @@ -3570,7 +3570,7 @@ directory would be the name of the repo but if you specified a target directory it will be that. For instance using the above example you might do: ``` - cd temp-test-ioccc + cd winner ``` You're ready to make your changes now! @@ -3619,11 +3619,11 @@ Cody would see: > Hi xexyl! You've successfully authenticated, but GitHub does not provide shell access. Now, assuming that the forked repo is -, you'd type: +, you'd type: ``` - git remote set-url origin git@github.com:xexyl/temp-test-ioccc.git + git remote set-url origin git@github.com:xexyl/winner.git ``` Now you'd be ready to make your commits. @@ -3688,9 +3688,9 @@ This might show: remote: Resolving deltas: 100% (4/4), completed with 4 local objects. remote: remote: Create a pull request for 'human-snakes' on GitHub by visiting: - remote: https://github.com/xexyl/temp-test-ioccc/pull/new/human-snakes + remote: https://github.com/xexyl/winner/pull/new/human-snakes remote: - To github.com:xexyl/temp-test-ioccc.git + To github.com:xexyl/winner.git * [new branch] human-snakes -> human-snakes branch 'human-snakes' set up to track 'origin/human-snakes'. ``` @@ -3699,7 +3699,7 @@ The link referred to above would then be opened to open a pull request. Just follow the instructions at this point. If however it does not show a link it is likely because the branch already exists in your GitHub account (for the repo). In this case you can open the link: - which might show something + which might show something like: ``` @@ -3736,7 +3736,7 @@ has the merge. To do this from the command line, assuming the fork in the above example, you would type: ``` - git checkout master && git pull https://github.com/ioccc-src/temp-test-ioccc.git master && git push origin master + git checkout master && git pull https://github.com/ioccc-src/winner.git master && git push origin master ``` This will merge your pull request to your fork. diff --git a/index.html b/index.html index 51f935e80..e2f8fadc9 100644 --- a/index.html +++ b/index.html @@ -381,6 +381,7 @@ +

        THIS IS AN EXPERIMENTAL IOCCC WEB SITE

        IMPORTANT: This is NOT the official IOCCC web site!

        Please visit www.ioccc.org for the official IOCCC web.

        @@ -390,6 +391,8 @@

        This web site will be undergoing major changes, so expect many broken links, typos and other problems. If you wish to recommend changes (understanding that things may be rapidly changing out from under your copy), then consider making pull requests against the temp-test-ioccc GitHub repo.

        +

        What follows is the actual index.html file

        +

        Suggestions for visitors

        Explore, under the Entries in the topbar menu:

          diff --git a/index.md b/index.md index 4233ed209..6f381fe27 100644 --- a/index.md +++ b/index.md @@ -1,3 +1,4 @@ + # THIS IS AN EXPERIMENTAL IOCCC WEB SITE **IMPORTANT: This is NOT the official IOCCC web site!** @@ -14,7 +15,9 @@ This web site will be undergoing major changes, so expect many broken links, typ If you wish to recommend changes (understanding that things may be rapidly changing out from under your copy), then consider making pull requests against the [temp-test-ioccc GitHub repo](https://github.com/ioccc-src/temp-test-ioccc). +## What follows is the actual index.html file + # Suggestions for visitors Explore, under the **Entries** in the _topbar_ menu: diff --git a/var.mk b/var.mk index 95f955216..65df885f9 100644 --- a/var.mk +++ b/var.mk @@ -291,7 +291,7 @@ X11_INCDIR= /opt/X11/include # For details on how to install SDL/SDL2 see FAQ 3.8 - How do I compile an # IOCCC entry that requires SDL1 or SDL2? which can be found at: # -# https://ioccc-src.github.io/temp-test-ioccc/faq.html#SDL +# https://www.ioccc.org/faq.html#SDL # # SDL2_INCLUDE_ROOT is the directory under which include/SDL/ and/or # include/SDL2/ may be found.