Script cleanup (#3)

* wget : continue dowload or skip if it is already done
* remove trailng whitespaces
* fix shebang #!/bin/bash -> #!/usr/bin/env
* make make-container.sh callable anywhere

Author: wizzup

build/Dockerfile

@@ -29,4 +29,4 @@ WORKDIR /s2client-api
 ADD downloads/s2client-api .
 ADD api-*.sh /s2client-api/
 
-ENTRYPOINT [ "/bin/bash" ] 
+ENTRYPOINT [ "/bin/bash" ]

build/api-all.sh

@@ -1,2 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
 ./api-build.sh && ./api-package.sh && ./api-copy.sh

build/api-copy.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 echo "Copying built artifacts into /build-mount"
 ls /s2client-api/s2client-api-*
 cp /s2client-api/s2client-api-* /build-mount/

build/api-package.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 VERSION=3.16.1
 PACKAGE=s2client-api-${VERSION}.tgz
 

build/build-copy.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 VERSION=3.16.1
 

build/make-container.sh

@@ -1,4 +1,8 @@
 #!/usr/bin/env bash
 
 # This builds the container
-docker build . -t s2client-api
+IMGNAME=s2client-api
+SCRIPT_PATH=${0%/*}
+
+echo ${IMGNAME} docker image building using ${SCRIPT_PATH}/Dockerfile
+docker build ${SCRIPT_PATH} -t ${IMGNAME}

dev/Dockerfile

@@ -27,4 +27,4 @@ RUN \
 # Add the code
 WORKDIR /s2client-api
 
-ENTRYPOINT [ "/bin/bash" ] 
+ENTRYPOINT [ "/bin/bash" ]

dev/make-container.sh

@@ -1,4 +1,8 @@
 #!/usr/bin/env bash
 
 # This builds the container
-docker build . -t s2client-dev
+IMGNAME=s2client-dev
+SCRIPT_PATH=${0%/*}
+
+echo ${IMGNAME} docker image building using ${SCRIPT_PATH}/Dockerfile
+docker build ${SCRIPT_PATH} -t ${IMGNAME}

game/Dockerfile

@@ -25,4 +25,4 @@ ENTRYPOINT [ "/SC2/3.16.1/StarCraftII/Versions/Base55958/SC2_x64", \
     "-listen", \
     "127.0.0.1", \
     "-port", \
-    "12000" ] 
+    "12000" ]

game/download.sh

@@ -2,12 +2,12 @@
 
 VERSION=3.16.1
 
-# This downloads zip files for current version 
+# This downloads zip files for current version
 mkdir -p downloads/
 pushd downloads
-wget http://blzdistsc2-a.akamaihd.net/Linux/SC2.${VERSION}.zip
-wget http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season1.zip
-wget http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season2.zip
-wget http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season3.zip
-wget http://blzdistsc2-a.akamaihd.net/MapPacks/Melee.zip
+wget -c http://blzdistsc2-a.akamaihd.net/Linux/SC2.${VERSION}.zip
+wget -c http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season1.zip
+wget -c http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season2.zip
+wget -c http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season3.zip
+wget -c http://blzdistsc2-a.akamaihd.net/MapPacks/Melee.zip
 popd