diff --git a/povray_wasm/compile.sh b/povray_wasm/compile.sh deleted file mode 100644 index 09b5a18..0000000 --- a/povray_wasm/compile.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -bash ./build_docker.sh - -sudo docker run \ - -v $PWD:/usr/src/build \ - povray_wasm \ - sh -c 'cd /usr/src/povray && cp ../build/build.sh build.sh && bash build.sh' \ No newline at end of file diff --git a/povray_wasm/docker.sh b/povray_wasm/docker.sh deleted file mode 100644 index 17c4758..0000000 --- a/povray_wasm/docker.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -sudo docker build -t povray_wasm --rm . \ No newline at end of file diff --git a/povray_wasm/pw b/povray_wasm/pw new file mode 100755 index 0000000..071fa4f --- /dev/null +++ b/povray_wasm/pw @@ -0,0 +1,19 @@ +#!/bin/bash + +help () { + echo "Usage: ./pw [command]" + echo " " + echo "Commands:" + echo " build - Build the docker image with optional -f/--force" + echo " compile - Run the compilation process" +} + +if [[ "${1}" == "build" ]]; then + bash ./scripts/build.sh "${2}" +elif [[ "${1}" == "cmd" ]]; then + bash ./scripts/cmd.sh ${@} +elif [[ "${1}" == "compile" ]]; then + bash ./scripts/compile.sh +else + help +fi \ No newline at end of file diff --git a/povray_wasm/scripts/build.sh b/povray_wasm/scripts/build.sh new file mode 100644 index 0000000..273898a --- /dev/null +++ b/povray_wasm/scripts/build.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +if [[ "${1}" == "-f" ]] || [[ "${1}" == "--force" ]]; then + ARG="--no-cache" +else + ARG="" +fi + +sudo docker build ${ARG} -t povray_wasm --rm . \ No newline at end of file diff --git a/povray_wasm/cmd.sh b/povray_wasm/scripts/cmd.sh similarity index 100% rename from povray_wasm/cmd.sh rename to povray_wasm/scripts/cmd.sh diff --git a/povray_wasm/scripts/compile.sh b/povray_wasm/scripts/compile.sh new file mode 100644 index 0000000..ab11dcb --- /dev/null +++ b/povray_wasm/scripts/compile.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +sudo docker run \ + -v $PWD:/usr/src/build \ + povray_wasm \ + sh -c 'cd /usr/src/povray && cp /usr/src/build/build.sh build.sh && bash build.sh' \ No newline at end of file