updated install script references

.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

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:

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 \

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
 

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
 

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}"

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}"

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"

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}"

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}"

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

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"

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}"

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' || :)"

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' |

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' || :)"

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}"

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

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}"