Skip to content

Commit

Permalink
chore: merge branch 'master' into feature/implement-conf
Browse files Browse the repository at this point in the history
  • Loading branch information
damienbutt committed Jul 29, 2024
2 parents b42bf14 + f846ff6 commit 7bcc3b7
Show file tree
Hide file tree
Showing 8 changed files with 178 additions and 178 deletions.
8 changes: 4 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
root = true

[*]

charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = tab
tab_width = 4
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]

trim_trailing_whitespace = false

[*.{yml,yaml}]

tab_width = 2

[Makefile]
indent_style = tab
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## [2.2.3](https://github.com/Norgate-AV/genlinx/compare/v2.2.2...v2.2.3) (2024-07-27)

### πŸ› Bug Fixes

- prepend arrays in config and dont sort ([86c8887](https://github.com/Norgate-AV/genlinx/commit/86c88872156b5a003562248a220ac897236e1476))

## [2.2.2](https://github.com/Norgate-AV/genlinx/compare/v2.2.1...v2.2.2) (2024-07-24)

### ⚠ BREAKING CHANGES
Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
man:
@pandoc docs/genlinx.1.md --to man docs/genlinx.1 > docs/genlinx.1
21 changes: 7 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -226,15 +226,12 @@ If you would like to use a different location to store the global configuration
"buildWithDebugInformation": false,
"buildWithSource": false,
"includePath": [
"C:\\Program Files (x86)\\Common Files\\AMXShare\\AXIs",
"C:\\Program Files\\AMX\\Resource Management Suite\\SDK\\NetLinx\\4.7.18\\includes"
"C:\\Program Files (x86)\\Common Files\\AMXShare\\AXIs"
],
"modulePath": [
"C:\\Program Files (x86)\\Common Files\\AMXShare\\Duet\\bundle",
"C:\\Program Files\\AMX\\Resource Management Suite\\SDK\\NetLinx\\4.7.18",
"C:\\Program Files\\AMX\\Resource Management Suite\\SDK\\NetLinx\\4.7.18\\monitors",
"C:\\Program Files\\AMX\\Resource Management Suite\\SDK\\NetLinx\\4.7.18\\monitors-duet",
"C:\\Program Files\\AMX\\Resource Management Suite\\SDK\\NetLinx\\4.7.18\\monitors-netlinx"
"C:\\Program Files (x86)\\Common Files\\AMXShare\\Duet\\lib",
"C:\\Program Files (x86)\\Common Files\\AMXShare\\Duet\\module"
],
"libraryPath": [
"C:\\Program Files (x86)\\Common Files\\AMXShare\\SYCs"
Expand All @@ -247,8 +244,7 @@ If you would like to use a different location to store the global configuration
"includeCompiledModuleFiles": true,
"includeFilesNotInWorkspace": true,
"extraFileSearchLocations": [
"C:\\Program Files (x86)\\Common Files\\AMXShare",
"C:\\Program Files\\AMX\\Resource Management Suite\\SDK\\NetLinx\\4.7.18"
"C:\\Program Files (x86)\\Common Files\\AMXShare"
],
"extraFileArchiveLocation": ".genlinx",
"all": false,
Expand Down Expand Up @@ -279,15 +275,12 @@ If you would like to use a different location to store the global configuration
"libraryPath": "-L"
},
"includePath": [
"C:\\Program Files (x86)\\Common Files\\AMXShare\\AXIs",
"C:\\Program Files\\AMX\\Resource Management Suite\\SDK\\NetLinx\\4.7.18\\includes"
"C:\\Program Files (x86)\\Common Files\\AMXShare\\AXIs"
],
"modulePath": [
"C:\\Program Files (x86)\\Common Files\\AMXShare\\Duet\\bundle",
"C:\\Program Files\\AMX\\Resource Management Suite\\SDK\\NetLinx\\4.7.18",
"C:\\Program Files\\AMX\\Resource Management Suite\\SDK\\NetLinx\\4.7.18\\monitors",
"C:\\Program Files\\AMX\\Resource Management Suite\\SDK\\NetLinx\\4.7.18\\monitors-duet",
"C:\\Program Files\\AMX\\Resource Management Suite\\SDK\\NetLinx\\4.7.18\\monitors-netlinx"
"C:\\Program Files (x86)\\Common Files\\AMXShare\\Duet\\lib",
"C:\\Program Files (x86)\\Common Files\\AMXShare\\Duet\\module"
],
"libraryPath": [
"C:\\Program Files (x86)\\Common Files\\AMXShare\\SYCs"
Expand Down
33 changes: 2 additions & 31 deletions docs/genlinx.1
Original file line number Diff line number Diff line change
@@ -1,26 +1,6 @@
.\" Automatically generated by Pandoc 2.19.2
.\"
.\" Define V font for inline verbatim, using C font in formats
.\" that render this, and otherwise B font.
.ie "\f[CB]x\f[]"x" \{\
. ftr V B
. ftr VI BI
. ftr VB B
. ftr VBI BI
.\}
.el \{\
. ftr V CR
. ftr VI CI
. ftr VB CB
. ftr VBI CBI
.\}
.TH "GENLINX" "1" "September 2022" "genlinx 0.0.0-development" ""
.hy
.SH NAME
.PP
genlinx - an open source CLI tool for NetLinx projects
genlinx \- an open source CLI tool for NetLinx projects
.SH SYNOPSIS
.PP
\f[B]genlinx\f[R] [\f[I]CMD\f[R]] [\f[I]OPTIONS\f[R]]
.PD 0
.P
Expand All @@ -37,12 +17,7 @@ genlinx - an open source CLI tool for NetLinx projects
.PD 0
.P
.PD
\f[B]genlinx config\f[R] [\f[I]OPTIONS\f[R]]
.PD 0
.P
.PD
.SH DESCRIPTION
.PP
\f[B]genlinx\f[R] is a CLI helper tool for work with NetLinx Studio
projects
.SH EXAMPLES
Expand All @@ -57,11 +32,9 @@ Success
\f[B]!0\f[R]
Failure
.SH BUGS
.PP
More then likely.
.SH COPYRIGHT
.PP
Copyright (C) 2023 Norgate AV Services Limited
Copyright (C) 2024 Norgate AV Services Limited
.PP
The MIT License (MIT)
.PP
Expand All @@ -83,5 +56,3 @@ 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.
.SH AUTHORS
Norgate AV Services Limited
7 changes: 3 additions & 4 deletions docs/genlinx.1.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
% GENLINX(1) genlinx 0.0.0-development
% GENLINX(1) genlinx 2.2.3
% Norgate AV Services Limited
% September 2023
% July 2024

# NAME

Expand All @@ -12,7 +12,6 @@ genlinx - an open source CLI tool for NetLinx projects
**genlinx archive** [*OPTIONS*]\
**genlinx build** [*OPTIONS*]\
**genlinx cfg** [*OPTIONS*]\
**genlinx config** [*OPTIONS*]\

# DESCRIPTION

Expand All @@ -37,7 +36,7 @@ More then likely.

# COPYRIGHT

Copyright (C) 2023 Norgate AV Services Limited
Copyright (C) 2024 Norgate AV Services Limited

The MIT License (MIT)

Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@norgate-av/genlinx",
"description": "A CLI utility for NetLinx projects πŸš€πŸš€πŸš€",
"version": "2.2.2",
"version": "2.2.3",
"license": "MIT",
"main": "dist/app.js",
"type": "module",
Expand Down Expand Up @@ -57,7 +57,7 @@
"@types/config": "^3.3.4",
"@types/figlet": "^1.5.8",
"@types/fs-extra": "^11.0.4",
"@types/node": "^20.14.12",
"@types/node": "^22.0.0",
"@types/nodemon": "^1.19.6",
"all-contributors-cli": "^6.26.1",
"commitizen": "^4.3.0",
Expand All @@ -79,7 +79,7 @@
"vite-node": "^2.0.4"
},
"dependencies": {
"@inquirer/prompts": "^5.3.2",
"@inquirer/prompts": "^5.3.4",
"adm-zip": "^0.5.14",
"chalk": "^5.3.0",
"commander": "^12.1.0",
Expand All @@ -91,7 +91,7 @@
"figlet": "^1.7.0",
"find-up": "7.0.0",
"fs-extra": "^11.2.0",
"listr2": "^8.2.3",
"listr2": "^8.2.4",
"mergician": "^2.0.2",
"node-jq": "^6.0.1",
"string-builder": "^0.1.8",
Expand Down
Loading

0 comments on commit 7bcc3b7

Please sign in to comment.