diff --git a/dropshell-build/Dockerfile b/dropshell-build/Dockerfile index 1ca6d80..e77d0f9 100644 --- a/dropshell-build/Dockerfile +++ b/dropshell-build/Dockerfile @@ -9,12 +9,12 @@ RUN apt-get update && apt-get install -y \ #RUN curl -fsSL https://get.docker.com | sh -COPY --chmod=0755 ./src/*.sh /usr/local/bin/ +COPY --chmod=0755 ./src/* /usr/local/bin/ -RUN /usr/local/bin/install_dropshell_build_requirements.sh +RUN /usr/local/bin/install_dropshell_build_requirements WORKDIR /app -ENTRYPOINT ["dropshell-build.sh","/app"] +ENTRYPOINT ["dropshell-build","/app"] diff --git a/dropshell-build/publish.sh b/dropshell-build/publish.sh index 44ffe2c..3b1af34 100755 --- a/dropshell-build/publish.sh +++ b/dropshell-build/publish.sh @@ -6,6 +6,6 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" "${SCRIPT_DIR}/build.sh" -"${SCRIPT_DIR}/sos/sos" upload "getbin.xyz" "dropshell-tool-install.sh" "${SCRIPT_DIR}/dropshell-tool-install.sh" +"${SCRIPT_DIR}/sos/sos" upload "getbin.xyz" "dropshell-build" "${SCRIPT_DIR}/src/dropshell-build" docker push gitea.jde.nz/public/dropshell-build:latest diff --git a/dropshell-build/src/dropshell-build.sh b/dropshell-build/src/dropshell-build similarity index 100% rename from dropshell-build/src/dropshell-build.sh rename to dropshell-build/src/dropshell-build diff --git a/dropshell-build/src/install_dropshell_build_requirements.sh b/dropshell-build/src/install_dropshell_build_requirements similarity index 100% rename from dropshell-build/src/install_dropshell_build_requirements.sh rename to dropshell-build/src/install_dropshell_build_requirements diff --git a/dropshell-build/test.sh b/dropshell-build/test.sh index f942261..52425ef 100755 --- a/dropshell-build/test.sh +++ b/dropshell-build/test.sh @@ -8,7 +8,7 @@ echo "Testing dropshell-build" "${SCRIPT_DIR}/build.sh" -"${SCRIPT_DIR}/src/dropshell-build.sh" "${SCRIPT_DIR}/test" +"${SCRIPT_DIR}/src/dropshell-build" "${SCRIPT_DIR}/test" "${SCRIPT_DIR}/test/output/ipdemo.x86_64" diff --git a/dropshell-tool/build.sh b/dropshell-tool/build.sh index 545d69d..f690e17 100755 --- a/dropshell-tool/build.sh +++ b/dropshell-tool/build.sh @@ -8,18 +8,18 @@ DROPSHELL_BUILD_DIR="${SCRIPT_DIR}/../dropshell-build/" DROPSHELL_BUILD_DIR=$(realpath "${DROPSHELL_BUILD_DIR}") # make sure the build script exists -if [ ! -f "${DROPSHELL_BUILD_DIR}/dropshell-build.sh" ]; then - echo "Error: dropshell-build.sh not found" +if [ ! -f "${DROPSHELL_BUILD_DIR}/dropshell-build" ]; then + echo "Error: dropshell-build not found" exit 1 fi -if [ ! -f "${DROPSHELL_BUILD_DIR}/install_dropshell_build_host.sh" ]; then - echo "Error: install_dropshell_build_host.sh not found" +if [ ! -f "${DROPSHELL_BUILD_DIR}/install_dropshell_build_requirements" ]; then + echo "Error: install_dropshell_build_requirements not found" exit 1 fi # install host dependencies -"${DROPSHELL_BUILD_DIR}/install_dropshell_build_host.sh" +"${DROPSHELL_BUILD_DIR}/install_dropshell_build_requirements" # run the build script -"${DROPSHELL_BUILD_DIR}/dropshell-build.sh" "$@" "${SCRIPT_DIR}" +"${DROPSHELL_BUILD_DIR}/dropshell-build" "$@" "${SCRIPT_DIR}"