updated bash-tools install script paths

.appveyor.yml

@@ -54,7 +54,7 @@ on_finish:
   #
   #     https://github.com/appveyor/ci/pull/3385
   #
-  #- sh: curl -sflL 'https://raw.githubusercontent.com/HariSekhon/Dockerfiles/master/setup/install_openssh.sh' | bash -e -
+  #- sh: curl -sflL 'https://raw.githubusercontent.com/HariSekhon/Dockerfiles/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

alpine-dev/Dockerfile

@@ -86,20 +86,20 @@ SHELL ["/bin/bash", "-euxo", "pipefail"]
 # didn't have Gradle / Groovy / Maven / SBT packages ...
 
 # Maven - has package now
-#RUN curl https://raw.githubusercontent.com/HariSekhon/bash-tools/master/setup/install_maven.sh | sh
+#RUN curl https://raw.githubusercontent.com/HariSekhon/bash-tools/master/install/install_maven.sh | sh
 
 # Gradle - has package now
-#RUN curl https://raw.githubusercontent.com/HariSekhon/bash-tools/master/setup/install_gradle.sh | sh
+#RUN curl https://raw.githubusercontent.com/HariSekhon/bash-tools/master/install/install_gradle.sh | sh
 
 WORKDIR /opt
 
 # SBT
-RUN curl https://raw.githubusercontent.com/HariSekhon/bash-tools/master/setup/install_sbt.sh | sh
+RUN curl https://raw.githubusercontent.com/HariSekhon/bash-tools/master/install/install_sbt.sh | sh
 
 WORKDIR /
 
 # Groovy
-RUN curl https://raw.githubusercontent.com/HariSekhon/bash-tools/master/setup/install_groovy.sh | sh
+RUN curl https://raw.githubusercontent.com/HariSekhon/bash-tools/master/install/install_groovy.sh | sh
 
 # Jython
 # hadolint ignore=DL4001

alpine-github/build.sh

@@ -20,7 +20,7 @@ mkdir -pv /github
 
 cd /github
 
-curl -sS https://raw.githubusercontent.com/HariSekhon/bash-tools/master/setup/install_sbt.sh | bash
+curl -sS https://raw.githubusercontent.com/HariSekhon/bash-tools/master/install/install_sbt.sh | bash
 
 if [ -n "$*" ]; then
     export REPOS="$*"

appveyor-centos/Dockerfile

@@ -23,8 +23,8 @@ LABEL org.opencontainers.image.description="AppVeyor BYOC Agent" \
 SHELL ["/bin/bash", "-euxo", "pipefail", "-c"]
 
 RUN yum install -y curl && \
-    curl -sS https://raw.githubusercontent.com/HariSekhon/DevOps-Bash-tools/master/setup/install_powershell_rhel.sh | bash && \
-    curl -sS https://raw.githubusercontent.com/HariSekhon/DevOps-Bash-tools/master/setup/install_appveyor_byoc.sh | bash && \
+    curl -sS https://raw.githubusercontent.com/HariSekhon/DevOps-Bash-tools/master/install/install_powershell_rhel.sh | bash && \
+    curl -sS https://raw.githubusercontent.com/HariSekhon/DevOps-Bash-tools/master/install/install_appveyor_byoc.sh | bash && \
     curl -sS https://raw.githubusercontent.com/HariSekhon/bash-tools/master/bin/clean_caches.sh | sh
 
 COPY entrypoint.sh /

appveyor-debian/Dockerfile

@@ -26,8 +26,8 @@ RUN bash -c ' \
     set -euxo pipefail && \
     apt-get update && \
     apt-get install -y curl && \
-    curl -sS https://raw.githubusercontent.com/HariSekhon/DevOps-Bash-tools/master/setup/install_powershell_debian.sh | bash && \
-    curl -sS https://raw.githubusercontent.com/HariSekhon/DevOps-Bash-tools/master/setup/install_appveyor_byoc.sh | bash && \
+    curl -sS https://raw.githubusercontent.com/HariSekhon/DevOps-Bash-tools/master/install/install_powershell_debian.sh | bash && \
+    curl -sS https://raw.githubusercontent.com/HariSekhon/DevOps-Bash-tools/master/install/install_appveyor_byoc.sh | bash && \
     curl -sS https://raw.githubusercontent.com/HariSekhon/bash-tools/master/bin/clean_caches.sh | sh \
     '
 

appveyor-ubuntu/Dockerfile

@@ -26,9 +26,9 @@ RUN bash -c ' \
     set -euxo pipefail && \
     apt-get update && \
     apt-get install -y curl && \
-    curl -sS https://raw.githubusercontent.com/HariSekhon/DevOps-Bash-tools/master/setup/install_powershell_ubuntu.sh | bash && \
+    curl -sS https://raw.githubusercontent.com/HariSekhon/DevOps-Bash-tools/master/install/install_powershell_ubuntu.sh | bash && \
     rm -fv packages-microsoft-prod.deb && \
-    curl -sS https://raw.githubusercontent.com/HariSekhon/DevOps-Bash-tools/master/setup/install_appveyor_byoc.sh | bash && \
+    curl -sS https://raw.githubusercontent.com/HariSekhon/DevOps-Bash-tools/master/install/install_appveyor_byoc.sh | bash && \
     curl -sS https://raw.githubusercontent.com/HariSekhon/bash-tools/master/bin/clean_caches.sh | sh \
     '
 

centos-dev/Dockerfile

@@ -92,7 +92,7 @@ RUN bash -c ' \
     jwhois; do \
         rpm -q "$x" >/dev/null || yum install -y "$x" || :; \
     done; \
-    curl -sS https://raw.githubusercontent.com/HariSekhon/bash-tools/master/setup/install_sbt.sh | bash -x && \
+    curl -sS https://raw.githubusercontent.com/HariSekhon/bash-tools/master/install/install_sbt.sh | bash -x && \
     yum autoremove -y && \
     yum clean all && \
     rm -rf /var/cache/yum && \
@@ -102,7 +102,7 @@ RUN bash -c ' \
 
 # Gradle doesn't have an RPM :-(
 RUN set -eux && \
-    wget https://raw.githubusercontent.com/HariSekhon/bash-tools/master/setup/install_gradle.sh && \
+    wget https://raw.githubusercontent.com/HariSekhon/bash-tools/master/install/install_gradle.sh && \
     bash install_gradle.sh && \
     rm -f install_gradle.sh
 

centos-github/build.sh

@@ -20,7 +20,7 @@ mkdir -pv /github
 
 cd /github
 
-curl -sS https://raw.githubusercontent.com/HariSekhon/bash-tools/master/setup/install_sbt.sh | bash
+curl -sS https://raw.githubusercontent.com/HariSekhon/bash-tools/master/install/install_sbt.sh | bash
 
 if [ -n "$*" ]; then
     export REPOS="$*"

debian-dev/Dockerfile

@@ -91,7 +91,7 @@ RUN bash -c ' \
     '
 
 # Gradle in Debian was old 1.5
-#RUN bash -c 'set -euxo pipefail && curl https://raw.githubusercontent.com/HariSekhon/bash-tools/master/setup/install_gradle.sh | sh'
+#RUN bash -c 'set -euxo pipefail && curl https://raw.githubusercontent.com/HariSekhon/bash-tools/master/install/install_gradle.sh | sh'
 
 # Jython
 RUN set -eux && \

debian-github/build.sh

@@ -20,7 +20,7 @@ mkdir -pv /github
 
 cd /github
 
-curl -sS https://raw.githubusercontent.com/HariSekhon/bash-tools/master/setup/install_sbt.sh | bash
+curl -sS https://raw.githubusercontent.com/HariSekhon/bash-tools/master/install/install_sbt.sh | bash
 
 if [ -n "$*" ]; then
     export REPOS="$*"

fedora-dev/Dockerfile

@@ -79,7 +79,7 @@ RUN bash -c ' \
 # Gradle doesn't have an RPM :-(
 RUN bash -c ' \
     set -euxo pipefail && \
-    wget https://raw.githubusercontent.com/HariSekhon/bash-tools/master/setup/install_gradle.sh && \
+    wget https://raw.githubusercontent.com/HariSekhon/bash-tools/master/install/install_gradle.sh && \
     bash install_gradle.sh && \
     rm -f install_gradle.sh \
     '

fedora-github/build.sh

@@ -20,7 +20,7 @@ mkdir -pv /github
 
 cd /github
 
-curl -sS https://raw.githubusercontent.com/HariSekhon/bash-tools/master/setup/install_sbt.sh | bash
+curl -sS https://raw.githubusercontent.com/HariSekhon/bash-tools/master/install/install_sbt.sh | bash
 
 if [ -n "$*" ]; then
     export REPOS="$*"

ubuntu-github/build.sh

@@ -20,7 +20,7 @@ mkdir -pv /github
 
 cd /github
 
-curl -sS https://raw.githubusercontent.com/HariSekhon/bash-tools/master/setup/install_sbt.sh | bash
+curl -sS https://raw.githubusercontent.com/HariSekhon/bash-tools/master/install/install_sbt.sh | bash
 
 if [ -n "$*" ]; then
     export REPOS="$*"