diff --git a/.appveyor.yml b/.appveyor.yml index 56b64623..5bc69bd4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -54,7 +54,7 @@ on_finish: # # https://github.com/appveyor/ci/pull/3385 # - #- sh: curl -sflL 'https://raw.githubusercontent.com/HariSekhon/DevOps-Bash-tools/master/setup/install_openssh.sh' | bash -e - + #- sh: curl -sflL 'https://raw.githubusercontent.com/HariSekhon/DevOps-Bash-tools/master/install/install_openssh.sh' | bash -e - # # https://www.appveyor.com/docs/how-to/ssh-to-build-worker/ - sh: if [ "$APPVEYOR_SSH_BLOCK" = true ]; then curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-ssh.sh' | bash -e -; fi diff --git a/Makefile b/Makefile index 39b37f4e..7c9874a8 100644 --- a/Makefile +++ b/Makefile @@ -230,8 +230,8 @@ azure-shell: link .PHONY: gcp gcp: system-packages - @./setup/install_gcloud_sdk.sh - @./setup/install_cloud_sql_proxy.sh + @./install/install_gcloud_sdk.sh + @./install/install_cloud_sql_proxy.sh .PHONY: gcp-shell gcp-shell: diff --git a/Makefile.in b/Makefile.in index c94716bd..92a56732 100755 --- a/Makefile.in +++ b/Makefile.in @@ -374,7 +374,7 @@ yum-packages: if type -P amazon-linux-extras; then \ $(SUDO) amazon-linux-extras install epel -y; \ fi - $(BASH_TOOLS)/setup/install_epel_repo.sh + $(BASH_TOOLS)/install/install_epel_repo.sh # installing packages individually to catch package install failure, otherwise yum succeeds even if it misses a package for x in rpm-packages.txt rpm-packages-dev.txt; do \ diff --git a/appveyor/appveyor_byoc.sh b/appveyor/appveyor_byoc.sh index e2455f2d..067888a0 100755 --- a/appveyor/appveyor_byoc.sh +++ b/appveyor/appveyor_byoc.sh @@ -28,7 +28,7 @@ fi export PATH="$PATH:/opt/appveyor/host-agent" if ! type -P appveyor-host-agent &>/dev/null; then - "$srcdir/../setup/install_appveyor_byoc.sh" + "$srcdir/../install/install_appveyor_byoc.sh" clear fi diff --git a/aws/eksctl_cluster.sh b/aws/eksctl_cluster.sh index 8c3f26e7..5ccc5d44 100755 --- a/aws/eksctl_cluster.sh +++ b/aws/eksctl_cluster.sh @@ -48,7 +48,7 @@ help_usage "$@" #min_args 1 "$@" if ! command -v eksctl &>/dev/null; then - "$srcdir/../setup/install_eksctl.sh" + "$srcdir/../install/install_eksctl.sh" echo fi diff --git a/bin/keycloak.sh b/bin/keycloak.sh index 226ba568..c5206463 100755 --- a/bin/keycloak.sh +++ b/bin/keycloak.sh @@ -55,7 +55,7 @@ export COMPOSE_PROJECT_NAME="bash-tools" export COMPOSE_FILE="$srcdir/../docker-compose/keycloak.yml" if ! type docker-compose &>/dev/null; then - "$srcdir/../setup/install_docker_compose.sh" + "$srcdir/../install/install_docker_compose.sh" fi action="${1:-up}" diff --git a/bin/wordpress.sh b/bin/wordpress.sh index afa5c377..1c866d2c 100755 --- a/bin/wordpress.sh +++ b/bin/wordpress.sh @@ -68,7 +68,7 @@ usage_args="[ up | down | ui ]" help_usage "$@" if ! type docker-compose &>/dev/null; then - "$srcdir/../setup/install_docker_compose.sh" + "$srcdir/../install/install_docker_compose.sh" fi action="${1:-up}" diff --git a/checks/check_travis_yml.sh b/checks/check_travis_yml.sh index aeccbebf..7c05c26f 100755 --- a/checks/check_travis_yml.sh +++ b/checks/check_travis_yml.sh @@ -61,7 +61,7 @@ else #gem install --user-install travis --no-rdoc --no-ri #"$srcdir/ruby_gem_install_if_absent.sh" travis # handles SSL linking issues on Mac - NONINTERACTIVE=1 "$srcdir/../setup/install_travis.sh" + NONINTERACTIVE=1 "$srcdir/../install/install_travis.sh" for path in ~/.gem/ruby/*/bin; do [ -d "$path" ] || continue echo "adding $path to \$PATH" diff --git a/cicd/concourse.sh b/cicd/concourse.sh index ee134c87..144a6407 100755 --- a/cicd/concourse.sh +++ b/cicd/concourse.sh @@ -74,7 +74,7 @@ pipeline="${PWD##*/}" job="$pipeline/build" if ! type docker-compose &>/dev/null; then - "$srcdir/../setup/install_docker_compose.sh" + "$srcdir/../install/install_docker_compose.sh" fi action="${1:-up}" diff --git a/cicd/gocd.sh b/cicd/gocd.sh index 7f8a4336..f7d1809f 100755 --- a/cicd/gocd.sh +++ b/cicd/gocd.sh @@ -55,7 +55,7 @@ export COMPOSE_PROJECT_NAME="bash-tools" export COMPOSE_FILE="$srcdir/../docker-compose/gocd.yml" if ! type docker-compose &>/dev/null; then - "$srcdir/../setup/install_docker_compose.sh" + "$srcdir/../install/install_docker_compose.sh" fi action="${1:-up}" diff --git a/circleci/circleci_local_execute.sh b/circleci/circleci_local_execute.sh index 657c0fce..4b30c606 100755 --- a/circleci/circleci_local_execute.sh +++ b/circleci/circleci_local_execute.sh @@ -32,7 +32,7 @@ usage(){ } if ! type -P circleci &>/dev/null; then - "$srcdir/../setup/install_circleci.sh" + "$srcdir/../install/install_circleci.sh" fi if [ $# -gt 1 ]; then diff --git a/gcp/gcp_sql_proxy.sh b/gcp/gcp_sql_proxy.sh index 8faa7a8b..2b839969 100755 --- a/gcp/gcp_sql_proxy.sh +++ b/gcp/gcp_sql_proxy.sh @@ -67,7 +67,7 @@ not_blank "$projects" || die "ERROR: no project specified and GCloud SDK core.pr export PATH="$PATH:"~/bin if ! type -P cloud_sql_proxy &>/dev/null; then - "$srcdir/../setup/install_cloud_sql_proxy.sh" + "$srcdir/../install/install_cloud_sql_proxy.sh" fi mkdir -p -v "$SOCKDIR" diff --git a/jenkins/jenkins.sh b/jenkins/jenkins.sh index cca0556a..af305268 100755 --- a/jenkins/jenkins.sh +++ b/jenkins/jenkins.sh @@ -75,7 +75,7 @@ export COMPOSE_FILE="$srcdir/../docker-compose/jenkins.yml" plugins_txt="$srcdir/../setup/jenkins-plugins.txt" if ! type docker-compose &>/dev/null; then - "$srcdir/../setup/install_docker_compose.sh" + "$srcdir/../install/install_docker_compose.sh" fi action="${1:-up}" diff --git a/kubernetes/kustomize_install_helm_charts.sh b/kubernetes/kustomize_install_helm_charts.sh index e42eb5e6..1e6b46b2 100755 --- a/kubernetes/kustomize_install_helm_charts.sh +++ b/kubernetes/kustomize_install_helm_charts.sh @@ -50,8 +50,8 @@ any_opt_usage "$@" #min_args 1 "$@" -type -P helm &>/dev/null || "$srcdir/../setup/install_helm.sh" -type -P yq &>/dev/null || "$srcdir/../setup/install_yq.sh" +type -P helm &>/dev/null || "$srcdir/../install/install_helm.sh" +type -P yq &>/dev/null || "$srcdir/../install/install_yq.sh" # if there are no repositories to show will return exit code 1 so || : helm_repos="$(helm repo list -o yaml | yq -r '.[] | [.name, .url] | @tsv' || :)" diff --git a/kubernetes/kustomize_parse_helm_charts.sh b/kubernetes/kustomize_parse_helm_charts.sh index 864f72dd..bc3a8921 100755 --- a/kubernetes/kustomize_parse_helm_charts.sh +++ b/kubernetes/kustomize_parse_helm_charts.sh @@ -53,7 +53,7 @@ help_usage "$@" min_args 1 "$@" -type -P yq &>/dev/null || "$srcdir/../setup/install_yq.sh" +type -P yq &>/dev/null || "$srcdir/../install/install_yq.sh" yq '.helmCharts[] | [.repo, .name, .version, .valuesFile] | @tsv' "$@" --no-doc --no-colors | sed '/^[[:space:]]*$/d' | diff --git a/kubernetes/kustomize_update_helm_chart_versions.sh b/kubernetes/kustomize_update_helm_chart_versions.sh index bfa1f925..38da174e 100755 --- a/kubernetes/kustomize_update_helm_chart_versions.sh +++ b/kubernetes/kustomize_update_helm_chart_versions.sh @@ -44,8 +44,8 @@ any_opt_usage "$@" #min_args 1 "$@" -type -P helm &>/dev/null || "$srcdir/../setup/install_helm.sh" -type -P yq &>/dev/null || "$srcdir/../setup/install_yq.sh" +type -P helm &>/dev/null || "$srcdir/../install/install_helm.sh" +type -P yq &>/dev/null || "$srcdir/../install/install_yq.sh" # if there are no repositories to show will return exit code 1 so || : helm_repos="$(helm repo list -o yaml | yq -r '.[] | [.name, .url] | @tsv' || :)" diff --git a/kubernetes/prometheus.sh b/kubernetes/prometheus.sh index d98d38d6..7803bdf6 100755 --- a/kubernetes/prometheus.sh +++ b/kubernetes/prometheus.sh @@ -39,7 +39,7 @@ export PROMETHEUS_URL="http://localhost:9090" export PROMETHEUS_CONFIG="${2:-$srcdir/../setup/prometheus.yml}" if ! type docker-compose &>/dev/null; then - "$srcdir/../setup/install_docker_compose.sh" + "$srcdir/../install/install_docker_compose.sh" fi action="${1:-up}" diff --git a/setup/shell_link.sh b/setup/shell_link.sh index c12487d6..8f8b31b8 100755 --- a/setup/shell_link.sh +++ b/setup/shell_link.sh @@ -70,7 +70,7 @@ for filename in $conf_files; do ln -sv $opts -- "$PWD/$filename" ~ || continue # if we link .vimrc then run the vundle install and get plugins to prevent vim errors every startup if [ "$filename" = .vimrc ]; then - "$srcdir/../setup/install_vundle.sh" || : + "$srcdir/../install/install_vundle.sh" || : fi fi done diff --git a/teamcity/teamcity.sh b/teamcity/teamcity.sh index 4c9a5547..92156cc7 100755 --- a/teamcity/teamcity.sh +++ b/teamcity/teamcity.sh @@ -114,7 +114,7 @@ project="GitHub" export TEAMCITY_URL="http://${DOCKER_HOST:-localhost}:8111" if ! type docker-compose &>/dev/null; then - "$srcdir/../setup/install_docker_compose.sh" + "$srcdir/../install/install_docker_compose.sh" fi action="${1:-up}"