From 6ea3d7eb8185d73d1aa7984c1c0bc6de58e8553d Mon Sep 17 00:00:00 2001 From: morrieinmaas Date: Wed, 6 Apr 2022 19:18:22 +0200 Subject: [PATCH 01/10] geat: add Windows powershell instructions for config write Signed-off-by: morrieinmaas --- docs/features/environments.md | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/docs/features/environments.md b/docs/features/environments.md index 368ac9a9..20b43769 100644 --- a/docs/features/environments.md +++ b/docs/features/environments.md @@ -19,7 +19,9 @@ configurations: token: ~ ``` - +{% hint style="warning" %} +In MS Windows Powershell you need to either run your command prompt application as administrator or allow your current user write access to `C:\Program Files\Common Files\` in order to be able to write a config file to disk. This does not apply when using WSL. +{% endhint %} ### Usage @@ -40,21 +42,19 @@ aries-cli configuration [SUBCOMMAND] | add | Add a new, or overwrite an existing, agent to your configuration file. | | view | Print your current configuration file. | - - ### Add Add a new, or overwrite an existing, agent to your configuration file. ``` -aries-cli configuration add [OPTIONS] +aries-cli configuration add [OPTIONS] ``` #### Available flags | Alias | Flag | Description | | ----- | ----------------------------- | ---------------------------------------------------------------------------- | -| `-a` | --api-key \ | This API key will be passed to the agent. | +| `-a` | --api-key \ | This API key will be passed to the agent. | | `-d` | --default | Add the default agent to the configuration (can be combined with `--token`). | | `-e` | `--environment ` | Specify your current environment. | | `-h` | `--help` | Print help information. | @@ -88,6 +88,3 @@ aries-cli configuration view #### Example usage The command results in a print out of both the configuration path and the `config.yaml` itself. - - - From 481740206ed68afe6fafb469041b09927b68378f Mon Sep 17 00:00:00 2001 From: morrieinmaas Date: Thu, 7 Apr 2022 22:38:04 +0200 Subject: [PATCH 02/10] Create simple PKGBUUILD for submission to AUR TODO: * Check on Arch this works * Possibly make this a template to be filled * add GH Action/pipeline for release to AUR Signed-off-by: morrieinmaas --- PKGBUILD | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 PKGBUILD diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 00000000..0164106d --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,13 @@ +pkgname="aries-cli" +pkgver="1.0.0" +pkggrel="1" +pkgdesc="A CLI tool for Aries written in rust" +arch=(x86_64) +sha512sums=("SKIP") + +package() { + echo "Fetching aries-cli binary\n" + curl -L /usr/local/share/aries-cli https://github.com/animo/aries-cli/releases/download/v${pkgver}/linux-x86_64-aries-cli + echo "Successfully added aries-cli to /usr/local/share/aries-cli\n" + echo "Enjoy the tool" +} From ecf951a02cb0360cee705b48d6c70ded5756feb4 Mon Sep 17 00:00:00 2001 From: morrieinmaas Date: Fri, 8 Apr 2022 15:11:44 +0200 Subject: [PATCH 03/10] feat: working PKGBUILD for arch This works in official arch docker image using makepkd it assumes basedevel is installed Signed-off-by: morrieinmaas --- PKGBUILD | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 0164106d..b54eba3e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,13 +1,18 @@ +# Mainainer: Animo Solutions development@animo.id pkgname="aries-cli" -pkgver="1.0.0" -pkggrel="1" +pkgver="0.1.0" +pkgrel="1" pkgdesc="A CLI tool for Aries written in rust" arch=(x86_64) -sha512sums=("SKIP") +license=('MIT') +depends=('sudo' 'libxcb') +provides=('aries-cli') +md5sums=() package() { - echo "Fetching aries-cli binary\n" - curl -L /usr/local/share/aries-cli https://github.com/animo/aries-cli/releases/download/v${pkgver}/linux-x86_64-aries-cli - echo "Successfully added aries-cli to /usr/local/share/aries-cli\n" + echo "Fetching aries-cli binary" + sudo curl -L -o /usr/bin/aries-cli https://github.com/animo/aries-cli/releases/download/v${pkgver}/linux-x86_64-aries-cli + sudo chmod +x /usr/bin/aries-cli + echo "Successfully installed aries-cli" echo "Enjoy the tool" } From 01fff352484c648cd36fcb84d69b9056e671198f Mon Sep 17 00:00:00 2001 From: morrieinmaas Date: Fri, 8 Apr 2022 15:56:56 +0200 Subject: [PATCH 04/10] add license Signed-off-by: morrieinmaas --- PKGBUILD | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index b54eba3e..c828a4b3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,9 +10,11 @@ provides=('aries-cli') md5sums=() package() { + sudo mkdir p /usr/share/licenses/${pkgname} + sudo curl -L -o /usr/share/licenses/${pkgname}/LICENSE https://raw.githubusercontent.com/animo/aries-cli/main/LICENSE echo "Fetching aries-cli binary" - sudo curl -L -o /usr/bin/aries-cli https://github.com/animo/aries-cli/releases/download/v${pkgver}/linux-x86_64-aries-cli - sudo chmod +x /usr/bin/aries-cli + sudo curl -L -o /usr/bin/${pkgname} https://github.com/animo/${pkgname}/releases/download/v${pkgver}/linux-x86_64-aries-cli + sudo chmod +x /usr/bin/${pkgname} echo "Successfully installed aries-cli" echo "Enjoy the tool" } From 19fea9a9a1946fe691c38479325748357ae1eefa Mon Sep 17 00:00:00 2001 From: morrieinmaas Date: Fri, 8 Apr 2022 16:05:03 +0200 Subject: [PATCH 05/10] remove unnecessary depends Signed-off-by: morrieinmaas --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index c828a4b3..be762bfb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgrel="1" pkgdesc="A CLI tool for Aries written in rust" arch=(x86_64) license=('MIT') -depends=('sudo' 'libxcb') +depends=() provides=('aries-cli') md5sums=() From ce43d4a85b10534c6bf4d71994b68fbf09eda975 Mon Sep 17 00:00:00 2001 From: morrieinmaas Date: Fri, 8 Apr 2022 16:06:30 +0200 Subject: [PATCH 06/10] change email address Signed-off-by: morrieinmaas --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index be762bfb..b7db3125 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,4 @@ -# Mainainer: Animo Solutions development@animo.id +# Mainainer: Animo Solutions contact@animo.id pkgname="aries-cli" pkgver="0.1.0" pkgrel="1" From 958843ca85a5348030257812bf5ccbaaa4b96ad1 Mon Sep 17 00:00:00 2001 From: morrieinmaas Date: Fri, 8 Apr 2022 16:09:06 +0200 Subject: [PATCH 07/10] add .SRCINFO Signed-off-by: morrieinmaas --- .SRCINFO | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .SRCINFO diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 00000000..006f7059 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,9 @@ +pkgbase = aries-cli + pkgdesc = A CLI tool for Aries written in rust + pkgver = 0.1.0 + pkgrel = 1 + arch = x86_64 + license = MIT + provides = aries-cli + +pkgname = aries-cli From ab275b4617995c19894fb9913823aa900fc994b6 Mon Sep 17 00:00:00 2001 From: morrieinmaas Date: Fri, 8 Apr 2022 16:34:12 +0200 Subject: [PATCH 08/10] fix typo Signed-off-by: morrieinmaas --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index b7db3125..302528f8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,7 +10,7 @@ provides=('aries-cli') md5sums=() package() { - sudo mkdir p /usr/share/licenses/${pkgname} + sudo mkdir -p /usr/share/licenses/${pkgname} sudo curl -L -o /usr/share/licenses/${pkgname}/LICENSE https://raw.githubusercontent.com/animo/aries-cli/main/LICENSE echo "Fetching aries-cli binary" sudo curl -L -o /usr/bin/${pkgname} https://github.com/animo/${pkgname}/releases/download/v${pkgver}/linux-x86_64-aries-cli From d15d93c094edd0b7854dfcdc73c0514ffbabee16 Mon Sep 17 00:00:00 2001 From: morrieinmaas Date: Fri, 8 Apr 2022 17:11:11 +0200 Subject: [PATCH 09/10] address code review feedback Signed-off-by: morrieinmaas --- PKGBUILD | 3 --- docs/features/environments.md | 13 ++++++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 302528f8..06524317 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,9 +12,6 @@ md5sums=() package() { sudo mkdir -p /usr/share/licenses/${pkgname} sudo curl -L -o /usr/share/licenses/${pkgname}/LICENSE https://raw.githubusercontent.com/animo/aries-cli/main/LICENSE - echo "Fetching aries-cli binary" sudo curl -L -o /usr/bin/${pkgname} https://github.com/animo/${pkgname}/releases/download/v${pkgver}/linux-x86_64-aries-cli sudo chmod +x /usr/bin/${pkgname} - echo "Successfully installed aries-cli" - echo "Enjoy the tool" } diff --git a/docs/features/environments.md b/docs/features/environments.md index 20b43769..368ac9a9 100644 --- a/docs/features/environments.md +++ b/docs/features/environments.md @@ -19,9 +19,7 @@ configurations: token: ~ ``` -{% hint style="warning" %} -In MS Windows Powershell you need to either run your command prompt application as administrator or allow your current user write access to `C:\Program Files\Common Files\` in order to be able to write a config file to disk. This does not apply when using WSL. -{% endhint %} + ### Usage @@ -42,19 +40,21 @@ aries-cli configuration [SUBCOMMAND] | add | Add a new, or overwrite an existing, agent to your configuration file. | | view | Print your current configuration file. | + + ### Add Add a new, or overwrite an existing, agent to your configuration file. ``` -aries-cli configuration add [OPTIONS] +aries-cli configuration add [OPTIONS] ``` #### Available flags | Alias | Flag | Description | | ----- | ----------------------------- | ---------------------------------------------------------------------------- | -| `-a` | --api-key \ | This API key will be passed to the agent. | +| `-a` | --api-key \ | This API key will be passed to the agent. | | `-d` | --default | Add the default agent to the configuration (can be combined with `--token`). | | `-e` | `--environment ` | Specify your current environment. | | `-h` | `--help` | Print help information. | @@ -88,3 +88,6 @@ aries-cli configuration view #### Example usage The command results in a print out of both the configuration path and the `config.yaml` itself. + + + From 217cc9992d52d478c1588ee5e024c1777c4c5de3 Mon Sep 17 00:00:00 2001 From: morrieinmaas Date: Fri, 8 Apr 2022 20:41:58 +0200 Subject: [PATCH 10/10] move AUR files ot pkg folder Signed-off-by: morrieinmaas --- .SRCINFO => pkg/.SRCINFO | 0 PKGBUILD => pkg/PKGBUILD | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename .SRCINFO => pkg/.SRCINFO (100%) rename PKGBUILD => pkg/PKGBUILD (100%) diff --git a/.SRCINFO b/pkg/.SRCINFO similarity index 100% rename from .SRCINFO rename to pkg/.SRCINFO diff --git a/PKGBUILD b/pkg/PKGBUILD similarity index 100% rename from PKGBUILD rename to pkg/PKGBUILD