From c1c3a4e04517a09bd38a2d2eb06fb35a8a512018 Mon Sep 17 00:00:00 2001 From: Antoine Barthelemy Date: Tue, 22 Oct 2024 23:32:56 +0200 Subject: [PATCH] misc: Modified .github/workflows/tests.yml init.sh scripts/ansible.sh scripts/aws.sh scripts/bash.sh scripts/bitwarden.sh scripts/bugzilla.sh scripts/c.sh scripts/cf2tf.sh scripts/checkmake.sh scripts/crane.sh scripts/docker.sh scripts/essentials.sh scripts/git.sh scripts/gitconfig.sh scripts/githooks.sh scripts/github.sh scripts/go.sh scripts/gvisor.sh scripts/hadolint.sh scripts/hclq.sh scripts/helm.sh scripts/jq.sh scripts/kind.sh scripts/kubectl.sh scripts/kubectx.sh scripts/kubens.sh scripts/kubesec.sh scripts/kustomize.sh scripts/latex.sh scripts/minikube.sh scripts/ohmyposh.sh scripts/opentofu.sh scripts/podman.sh scripts/python.sh scripts/rust.sh scripts/shellcheck.sh scripts/slack.sh scripts/ssh.sh scripts/strongswan.sh scripts/terraform.sh scripts/terraformdocs.sh scripts/tfam.sh scripts/tfexe.sh scripts/tflint.sh scripts/tfswitch.sh scripts/tldr.sh scripts/trivy.sh scripts/vagrant.sh scripts/vault.sh scripts/vim.sh scripts/yq.sh --- .github/workflows/tests.yml | 2 +- init.sh | 8 ++++---- tools/ansible.install.sh => scripts/ansible.sh | 0 tools/aws.install.sh => scripts/aws.sh | 0 tools/bash.install.sh => scripts/bash.sh | 0 tools/bitwarden.install.sh => scripts/bitwarden.sh | 0 tools/bugzilla.install.sh => scripts/bugzilla.sh | 0 tools/c.install.sh => scripts/c.sh | 0 tools/cf2tf.install.sh => scripts/cf2tf.sh | 0 tools/checkmake.install.sh => scripts/checkmake.sh | 0 tools/crane.install.sh => scripts/crane.sh | 0 tools/docker.install.sh => scripts/docker.sh | 0 tools/essentials.install.sh => scripts/essentials.sh | 0 tools/git.install.sh => scripts/git.sh | 0 tools/gitconfig.install.sh => scripts/gitconfig.sh | 0 tools/githooks.install.sh => scripts/githooks.sh | 0 tools/github.install.sh => scripts/github.sh | 0 tools/go.install.sh => scripts/go.sh | 0 tools/gvisor.install.sh => scripts/gvisor.sh | 0 tools/hadolint.install.sh => scripts/hadolint.sh | 0 tools/hclq.install.sh => scripts/hclq.sh | 0 tools/helm.install.sh => scripts/helm.sh | 0 tools/jq.install.sh => scripts/jq.sh | 0 tools/kind.install.sh => scripts/kind.sh | 0 tools/kubectl.install.sh => scripts/kubectl.sh | 0 tools/kubectx.install.sh => scripts/kubectx.sh | 0 tools/kubens.install.sh => scripts/kubens.sh | 0 tools/kubesec.install.sh => scripts/kubesec.sh | 0 tools/kustomize.install.sh => scripts/kustomize.sh | 0 tools/latex.install.sh => scripts/latex.sh | 0 tools/minikube.install.sh => scripts/minikube.sh | 0 tools/ohmyposh.install.sh => scripts/ohmyposh.sh | 0 tools/opentofu.install.sh => scripts/opentofu.sh | 0 tools/podman.install.sh => scripts/podman.sh | 0 tools/python.install.sh => scripts/python.sh | 0 tools/rust.install.sh => scripts/rust.sh | 0 tools/shellcheck.install.sh => scripts/shellcheck.sh | 0 tools/slack.install.sh => scripts/slack.sh | 0 tools/ssh.install.sh => scripts/ssh.sh | 0 tools/strongswan.install.sh => scripts/strongswan.sh | 0 tools/terraform.install.sh => scripts/terraform.sh | 0 .../terraformdocs.install.sh => scripts/terraformdocs.sh | 0 tools/tfam.install.sh => scripts/tfam.sh | 0 tools/tfexe.install.sh => scripts/tfexe.sh | 0 tools/tflint.install.sh => scripts/tflint.sh | 0 tools/tfswitch.install.sh => scripts/tfswitch.sh | 0 tools/tldr.install.sh => scripts/tldr.sh | 0 tools/trivy.install.sh => scripts/trivy.sh | 0 tools/vagrant.install.sh => scripts/vagrant.sh | 0 tools/vault.install.sh => scripts/vault.sh | 0 tools/vim.install.sh => scripts/vim.sh | 0 tools/yq.install.sh => scripts/yq.sh | 0 52 files changed, 5 insertions(+), 5 deletions(-) rename tools/ansible.install.sh => scripts/ansible.sh (100%) rename tools/aws.install.sh => scripts/aws.sh (100%) rename tools/bash.install.sh => scripts/bash.sh (100%) rename tools/bitwarden.install.sh => scripts/bitwarden.sh (100%) rename tools/bugzilla.install.sh => scripts/bugzilla.sh (100%) rename tools/c.install.sh => scripts/c.sh (100%) rename tools/cf2tf.install.sh => scripts/cf2tf.sh (100%) rename tools/checkmake.install.sh => scripts/checkmake.sh (100%) rename tools/crane.install.sh => scripts/crane.sh (100%) rename tools/docker.install.sh => scripts/docker.sh (100%) rename tools/essentials.install.sh => scripts/essentials.sh (100%) rename tools/git.install.sh => scripts/git.sh (100%) rename tools/gitconfig.install.sh => scripts/gitconfig.sh (100%) rename tools/githooks.install.sh => scripts/githooks.sh (100%) rename tools/github.install.sh => scripts/github.sh (100%) rename tools/go.install.sh => scripts/go.sh (100%) rename tools/gvisor.install.sh => scripts/gvisor.sh (100%) rename tools/hadolint.install.sh => scripts/hadolint.sh (100%) rename tools/hclq.install.sh => scripts/hclq.sh (100%) rename tools/helm.install.sh => scripts/helm.sh (100%) rename tools/jq.install.sh => scripts/jq.sh (100%) rename tools/kind.install.sh => scripts/kind.sh (100%) rename tools/kubectl.install.sh => scripts/kubectl.sh (100%) rename tools/kubectx.install.sh => scripts/kubectx.sh (100%) rename tools/kubens.install.sh => scripts/kubens.sh (100%) rename tools/kubesec.install.sh => scripts/kubesec.sh (100%) rename tools/kustomize.install.sh => scripts/kustomize.sh (100%) rename tools/latex.install.sh => scripts/latex.sh (100%) rename tools/minikube.install.sh => scripts/minikube.sh (100%) rename tools/ohmyposh.install.sh => scripts/ohmyposh.sh (100%) rename tools/opentofu.install.sh => scripts/opentofu.sh (100%) rename tools/podman.install.sh => scripts/podman.sh (100%) rename tools/python.install.sh => scripts/python.sh (100%) rename tools/rust.install.sh => scripts/rust.sh (100%) rename tools/shellcheck.install.sh => scripts/shellcheck.sh (100%) rename tools/slack.install.sh => scripts/slack.sh (100%) rename tools/ssh.install.sh => scripts/ssh.sh (100%) rename tools/strongswan.install.sh => scripts/strongswan.sh (100%) rename tools/terraform.install.sh => scripts/terraform.sh (100%) rename tools/terraformdocs.install.sh => scripts/terraformdocs.sh (100%) rename tools/tfam.install.sh => scripts/tfam.sh (100%) rename tools/tfexe.install.sh => scripts/tfexe.sh (100%) rename tools/tflint.install.sh => scripts/tflint.sh (100%) rename tools/tfswitch.install.sh => scripts/tfswitch.sh (100%) rename tools/tldr.install.sh => scripts/tldr.sh (100%) rename tools/trivy.install.sh => scripts/trivy.sh (100%) rename tools/vagrant.install.sh => scripts/vagrant.sh (100%) rename tools/vault.install.sh => scripts/vault.sh (100%) rename tools/vim.install.sh => scripts/vim.sh (100%) rename tools/yq.install.sh => scripts/yq.sh (100%) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a11d993..c79d063 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #4.2.1 - id: ls run: | - echo files="$(ls tools/ | sed 's/.install.sh//' | xargs jq -c -n '$ARGS.positional' --args)" >> "$GITHUB_OUTPUT" + echo files="$(ls scripts/ | sed 's/.sh//' | xargs jq -c -n '$ARGS.positional' --args)" >> "$GITHUB_OUTPUT" test: needs: list diff --git a/init.sh b/init.sh index 4d6cbb1..30655c5 100755 --- a/init.sh +++ b/init.sh @@ -27,9 +27,9 @@ _install_bat() { _prompt() { _install_skim - exit + #exit _install_bat - selection="$(find tools/ -type f -printf "%f\n" | awk -F '.' '{ print $1 }' | sort | bin/sk --multi --bind 'right:select-all,left:deselect-all,space:toggle+up' --preview="bin/bat --color=always tools/{}.install.sh --color=always")" + selection="$(find scripts/ -type f -printf "%f\n" | awk -F '.' '{ print $1 }' | sort | bin/sk --multi --bind 'right:select-all,left:deselect-all,space:toggle+up' --preview="bin/bat --color=always scripts/{}.sh --color=always")" } download_path=$(mktemp -d -t conf.XXXXXXXXXX) @@ -47,8 +47,8 @@ else fi for i in $selection; do - if test -e "tools/$i.install.sh"; then - sh "tools/$i.install.sh" + if test -e "scripts/$i.sh"; then + sh "scripts/$i.sh" fi if test -e "bashrc.d/$i"; then mkdir -p "$HOME/.bashrc.d/" diff --git a/tools/ansible.install.sh b/scripts/ansible.sh similarity index 100% rename from tools/ansible.install.sh rename to scripts/ansible.sh diff --git a/tools/aws.install.sh b/scripts/aws.sh similarity index 100% rename from tools/aws.install.sh rename to scripts/aws.sh diff --git a/tools/bash.install.sh b/scripts/bash.sh similarity index 100% rename from tools/bash.install.sh rename to scripts/bash.sh diff --git a/tools/bitwarden.install.sh b/scripts/bitwarden.sh similarity index 100% rename from tools/bitwarden.install.sh rename to scripts/bitwarden.sh diff --git a/tools/bugzilla.install.sh b/scripts/bugzilla.sh similarity index 100% rename from tools/bugzilla.install.sh rename to scripts/bugzilla.sh diff --git a/tools/c.install.sh b/scripts/c.sh similarity index 100% rename from tools/c.install.sh rename to scripts/c.sh diff --git a/tools/cf2tf.install.sh b/scripts/cf2tf.sh similarity index 100% rename from tools/cf2tf.install.sh rename to scripts/cf2tf.sh diff --git a/tools/checkmake.install.sh b/scripts/checkmake.sh similarity index 100% rename from tools/checkmake.install.sh rename to scripts/checkmake.sh diff --git a/tools/crane.install.sh b/scripts/crane.sh similarity index 100% rename from tools/crane.install.sh rename to scripts/crane.sh diff --git a/tools/docker.install.sh b/scripts/docker.sh similarity index 100% rename from tools/docker.install.sh rename to scripts/docker.sh diff --git a/tools/essentials.install.sh b/scripts/essentials.sh similarity index 100% rename from tools/essentials.install.sh rename to scripts/essentials.sh diff --git a/tools/git.install.sh b/scripts/git.sh similarity index 100% rename from tools/git.install.sh rename to scripts/git.sh diff --git a/tools/gitconfig.install.sh b/scripts/gitconfig.sh similarity index 100% rename from tools/gitconfig.install.sh rename to scripts/gitconfig.sh diff --git a/tools/githooks.install.sh b/scripts/githooks.sh similarity index 100% rename from tools/githooks.install.sh rename to scripts/githooks.sh diff --git a/tools/github.install.sh b/scripts/github.sh similarity index 100% rename from tools/github.install.sh rename to scripts/github.sh diff --git a/tools/go.install.sh b/scripts/go.sh similarity index 100% rename from tools/go.install.sh rename to scripts/go.sh diff --git a/tools/gvisor.install.sh b/scripts/gvisor.sh similarity index 100% rename from tools/gvisor.install.sh rename to scripts/gvisor.sh diff --git a/tools/hadolint.install.sh b/scripts/hadolint.sh similarity index 100% rename from tools/hadolint.install.sh rename to scripts/hadolint.sh diff --git a/tools/hclq.install.sh b/scripts/hclq.sh similarity index 100% rename from tools/hclq.install.sh rename to scripts/hclq.sh diff --git a/tools/helm.install.sh b/scripts/helm.sh similarity index 100% rename from tools/helm.install.sh rename to scripts/helm.sh diff --git a/tools/jq.install.sh b/scripts/jq.sh similarity index 100% rename from tools/jq.install.sh rename to scripts/jq.sh diff --git a/tools/kind.install.sh b/scripts/kind.sh similarity index 100% rename from tools/kind.install.sh rename to scripts/kind.sh diff --git a/tools/kubectl.install.sh b/scripts/kubectl.sh similarity index 100% rename from tools/kubectl.install.sh rename to scripts/kubectl.sh diff --git a/tools/kubectx.install.sh b/scripts/kubectx.sh similarity index 100% rename from tools/kubectx.install.sh rename to scripts/kubectx.sh diff --git a/tools/kubens.install.sh b/scripts/kubens.sh similarity index 100% rename from tools/kubens.install.sh rename to scripts/kubens.sh diff --git a/tools/kubesec.install.sh b/scripts/kubesec.sh similarity index 100% rename from tools/kubesec.install.sh rename to scripts/kubesec.sh diff --git a/tools/kustomize.install.sh b/scripts/kustomize.sh similarity index 100% rename from tools/kustomize.install.sh rename to scripts/kustomize.sh diff --git a/tools/latex.install.sh b/scripts/latex.sh similarity index 100% rename from tools/latex.install.sh rename to scripts/latex.sh diff --git a/tools/minikube.install.sh b/scripts/minikube.sh similarity index 100% rename from tools/minikube.install.sh rename to scripts/minikube.sh diff --git a/tools/ohmyposh.install.sh b/scripts/ohmyposh.sh similarity index 100% rename from tools/ohmyposh.install.sh rename to scripts/ohmyposh.sh diff --git a/tools/opentofu.install.sh b/scripts/opentofu.sh similarity index 100% rename from tools/opentofu.install.sh rename to scripts/opentofu.sh diff --git a/tools/podman.install.sh b/scripts/podman.sh similarity index 100% rename from tools/podman.install.sh rename to scripts/podman.sh diff --git a/tools/python.install.sh b/scripts/python.sh similarity index 100% rename from tools/python.install.sh rename to scripts/python.sh diff --git a/tools/rust.install.sh b/scripts/rust.sh similarity index 100% rename from tools/rust.install.sh rename to scripts/rust.sh diff --git a/tools/shellcheck.install.sh b/scripts/shellcheck.sh similarity index 100% rename from tools/shellcheck.install.sh rename to scripts/shellcheck.sh diff --git a/tools/slack.install.sh b/scripts/slack.sh similarity index 100% rename from tools/slack.install.sh rename to scripts/slack.sh diff --git a/tools/ssh.install.sh b/scripts/ssh.sh similarity index 100% rename from tools/ssh.install.sh rename to scripts/ssh.sh diff --git a/tools/strongswan.install.sh b/scripts/strongswan.sh similarity index 100% rename from tools/strongswan.install.sh rename to scripts/strongswan.sh diff --git a/tools/terraform.install.sh b/scripts/terraform.sh similarity index 100% rename from tools/terraform.install.sh rename to scripts/terraform.sh diff --git a/tools/terraformdocs.install.sh b/scripts/terraformdocs.sh similarity index 100% rename from tools/terraformdocs.install.sh rename to scripts/terraformdocs.sh diff --git a/tools/tfam.install.sh b/scripts/tfam.sh similarity index 100% rename from tools/tfam.install.sh rename to scripts/tfam.sh diff --git a/tools/tfexe.install.sh b/scripts/tfexe.sh similarity index 100% rename from tools/tfexe.install.sh rename to scripts/tfexe.sh diff --git a/tools/tflint.install.sh b/scripts/tflint.sh similarity index 100% rename from tools/tflint.install.sh rename to scripts/tflint.sh diff --git a/tools/tfswitch.install.sh b/scripts/tfswitch.sh similarity index 100% rename from tools/tfswitch.install.sh rename to scripts/tfswitch.sh diff --git a/tools/tldr.install.sh b/scripts/tldr.sh similarity index 100% rename from tools/tldr.install.sh rename to scripts/tldr.sh diff --git a/tools/trivy.install.sh b/scripts/trivy.sh similarity index 100% rename from tools/trivy.install.sh rename to scripts/trivy.sh diff --git a/tools/vagrant.install.sh b/scripts/vagrant.sh similarity index 100% rename from tools/vagrant.install.sh rename to scripts/vagrant.sh diff --git a/tools/vault.install.sh b/scripts/vault.sh similarity index 100% rename from tools/vault.install.sh rename to scripts/vault.sh diff --git a/tools/vim.install.sh b/scripts/vim.sh similarity index 100% rename from tools/vim.install.sh rename to scripts/vim.sh diff --git a/tools/yq.install.sh b/scripts/yq.sh similarity index 100% rename from tools/yq.install.sh rename to scripts/yq.sh