From 2df4a0c0f1865950520761da6c99ce2d6a7eb6a9 Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Tue, 27 Oct 2020 15:41:50 +0000 Subject: [PATCH] Properly enforced LF in DMAPI Updater (#14747) * Properly enforced LF in DMAPI Updater * Force license and README to LF while I am at it --- .github/workflows/update_tgs_dmapi.yml | 8 +++++ code/modules/tgs/LICENSE | 48 +++++++++++++------------- code/modules/tgs/README.md | 26 +++++++------- code/modules/tgs/core/README.md | 14 ++++---- code/modules/tgs/v3210/README.md | 12 +++---- code/modules/tgs/v4/README.md | 12 +++---- 6 files changed, 64 insertions(+), 56 deletions(-) diff --git a/.github/workflows/update_tgs_dmapi.yml b/.github/workflows/update_tgs_dmapi.yml index 4294da9df61..760b6dc9064 100644 --- a/.github/workflows/update_tgs_dmapi.yml +++ b/.github/workflows/update_tgs_dmapi.yml @@ -19,12 +19,20 @@ jobs: git checkout tgs-dmapi-update git reset --hard master + - name: Install Deps + run: sudo apt install dos2unix + - name: Apply DMAPI update uses: tgstation/tgs-dmapi-updater@v2 with: header-path: 'code/__DEFINES/tgs.dm' library-path: 'code/modules/tgs' + - name: Convert From CRLF To LF + run: | + dos2unix code/__DEFINES/tgs.dm + find code/modules/tgs -type f -print0 | xargs -0 dos2unix -- + - name: Commit and Push run: | git config --local core.eol lf diff --git a/code/modules/tgs/LICENSE b/code/modules/tgs/LICENSE index 687ebbd4236..221f9e1deb2 100644 --- a/code/modules/tgs/LICENSE +++ b/code/modules/tgs/LICENSE @@ -1,24 +1,24 @@ -The MIT License - -Copyright (c) 2017 Jordan Brown - -Permission is hereby granted, free of charge, -to any person obtaining a copy of this software and -associated documentation files (the "Software"), to -deal in the Software without restriction, including -without limitation the rights to use, copy, modify, -merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom -the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice -shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR -ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +The MIT License + +Copyright (c) 2017 Jordan Brown + +Permission is hereby granted, free of charge, +to any person obtaining a copy of this software and +associated documentation files (the "Software"), to +deal in the Software without restriction, including +without limitation the rights to use, copy, modify, +merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom +the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice +shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/code/modules/tgs/README.md b/code/modules/tgs/README.md index 9842dbe3eba..445cee41f57 100644 --- a/code/modules/tgs/README.md +++ b/code/modules/tgs/README.md @@ -1,13 +1,13 @@ -# DMAPI Internals - -This folder should be placed on it's own inside a codebase that wishes to use the TGS DMAPI. Warranty void if modified. - -- [includes.dm](./includes.dm) is the file that should be included by DM code, it handles including the rest. -- The [core](./core) folder includes all code not directly part of any API version. -- The other versioned folders contain code for the different DMAPI versions. - - [v3210](./v3210) contains the final TGS3 API. - - [v4](./v4) is the legacy DMAPI 4 (Used in TGS 4.0.X versions). - - [v5](./v5) is the current DMAPI version used by TGS4 >=4.1. -- [LICENSE](./LICENSE) is the MIT license for the DMAPI. - -APIs communicate with TGS in two ways. All versions implement TGS -> DM communication using /world/Topic. DM -> TGS communication, called the bridge method, is different for each version. +# DMAPI Internals + +This folder should be placed on it's own inside a codebase that wishes to use the TGS DMAPI. Warranty void if modified. + +- [includes.dm](./includes.dm) is the file that should be included by DM code, it handles including the rest. +- The [core](./core) folder includes all code not directly part of any API version. +- The other versioned folders contain code for the different DMAPI versions. + - [v3210](./v3210) contains the final TGS3 API. + - [v4](./v4) is the legacy DMAPI 4 (Used in TGS 4.0.X versions). + - [v5](./v5) is the current DMAPI version used by TGS4 >=4.1. +- [LICENSE](./LICENSE) is the MIT license for the DMAPI. + +APIs communicate with TGS in two ways. All versions implement TGS -> DM communication using /world/Topic. DM -> TGS communication, called the bridge method, is different for each version. diff --git a/code/modules/tgs/core/README.md b/code/modules/tgs/core/README.md index d8800b90a04..aa3c7a9c9db 100644 --- a/code/modules/tgs/core/README.md +++ b/code/modules/tgs/core/README.md @@ -1,8 +1,8 @@ -# Core DMAPI functions - -This folder contains all DMAPI code not directly involved in an API. - -- [_definitions.dm](./definitions.dm) contains defines needed across DMAPI internals. -- [core.dm](./core.dm) contains the implementations of the `/world/proc/TgsXXX()` procs. Many map directly to the `/datum/tgs_api` functions. It also contains the /datum selection and setup code. -- [datum.dm](./datum.dm) contains the `/datum/tgs_api` declarations that all APIs must implement. +# Core DMAPI functions + +This folder contains all DMAPI code not directly involved in an API. + +- [_definitions.dm](./definitions.dm) contains defines needed across DMAPI internals. +- [core.dm](./core.dm) contains the implementations of the `/world/proc/TgsXXX()` procs. Many map directly to the `/datum/tgs_api` functions. It also contains the /datum selection and setup code. +- [datum.dm](./datum.dm) contains the `/datum/tgs_api` declarations that all APIs must implement. - [tgs_version.dm](./tgs_version.dm) contains the `/datum/tgs_version` definition \ No newline at end of file diff --git a/code/modules/tgs/v3210/README.md b/code/modules/tgs/v3210/README.md index c50faf75005..f96e7cf3b31 100644 --- a/code/modules/tgs/v3210/README.md +++ b/code/modules/tgs/v3210/README.md @@ -1,6 +1,6 @@ -# DMAPI V3 - -This DMAPI implements bridge using file output which TGS monitors for. - -- [api.dm](./api.dm) contains the bulk of the API code. -- [commands.dm](./commands.dm) contains functions relating to `/datum/tgs_chat_command`s. +# DMAPI V3 + +This DMAPI implements bridge using file output which TGS monitors for. + +- [api.dm](./api.dm) contains the bulk of the API code. +- [commands.dm](./commands.dm) contains functions relating to `/datum/tgs_chat_command`s. diff --git a/code/modules/tgs/v4/README.md b/code/modules/tgs/v4/README.md index dd7d7766990..78191447b27 100644 --- a/code/modules/tgs/v4/README.md +++ b/code/modules/tgs/v4/README.md @@ -1,6 +1,6 @@ -# DMAPI V4 - -This DMAPI implements bridge requests using file output which TGS monitors for. It has a safe mode restriction. - -- [api.dm](./api.dm) contains the bulk of the API code. -- [commands.dm](./commands.dm) contains functions relating to `/datum/tgs_chat_command`s. +# DMAPI V4 + +This DMAPI implements bridge requests using file output which TGS monitors for. It has a safe mode restriction. + +- [api.dm](./api.dm) contains the bulk of the API code. +- [commands.dm](./commands.dm) contains functions relating to `/datum/tgs_chat_command`s.