'Generic Commit'

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

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

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"
 

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