diff options
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | README.md | 8 | ||||
| -rwxr-xr-x | install.sh | 77 |
3 files changed, 49 insertions, 42 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f6f5810..64810fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # 0.C.0 +*0.C.0-F* + +* Fix and update readme +* Update and fix installation script +* Put version number in readme + *0.C.0-E* * Update readme @@ -1,4 +1,6 @@ - +BOWSHOCK 0.C.0-F + + # CHANGELOG @@ -50,14 +52,14 @@ build/bowshock/bowshock --skip ## SHADER VALIDATION -The shaders at `bowshock/shader`` may be validated using the Python script `validateShaders.py`. If the shaders contain errors, and these are not fixed before installation, the program will fail to compile them during run‐time. +The shaders at `bowshock/shader` may be validated using the Python script `validateShaders.py`. If the shaders contain errors, and these are not fixed before installation, the program will fail to compile them during run‐time. # INSTALLATION The script `install.sh` will install the executable, the assets, the shaders, etc. to the specified directories: ``` -./install.sh [build directory] [binary directory] [data directory] +./install.sh all [build directory] [binary directory] [data directory] ``` # MIRRORS @@ -1,71 +1,70 @@ #!/bin/sh installBinary() { - builddir="${1}" - bindir="${2}" + buildDirectory="${1}" + binaryDirectory="${2}" - mkdir -pvm755 "${bindir}" + mkdir -pvm755 "${binaryDirectory}" - install -vm755 "${builddir}/bowshock/bowshock" "${bindir}"/bowshock + install -vm755 "${buildDirectory}/bowshock/bowshock" "${binaryDirectory}"/bowshock } installData() { - srcdir="${1}" - datdir="${2}" + sourceDirectory="${1}" + dataDirectory="${2}" - mkdir -pvm755 "${datdir}/shaders" + mkdir -pvm755 "${dataDirectory}/shaders" - install -vm644 "${srcdir}/CHANGELOG.txt" "${datdir}" - install -vm644 "${srcdir}/CREDITS.txt" "${datdir}" - install -vm644 "${srcdir}/bowshock/shader/"*".glsl" "${datdir}/shaders" + install -vm644 "${sourceDirectory}/CHANGELOG.md" "${dataDirectory}" + install -vm644 "${sourceDirectory}/CREDITS.txt" "${dataDirectory}" + install -vm644 "${sourceDirectory}/bowshock/shader/"*".glsl" "${dataDirectory}/shaders" } +echo installing "${1}" + if [ "${1}" == "data" ] then - echo installing data... - if [ -z "${2}" ] then echo failure: data directory is not set exit 2 fi - srcdir="${PWD}" - datdir="${2}" + sourceDirectory="${PWD}" + dataDirectory="${2}" - installData "${srcdir}" "${datdir}" + installData "${sourceDirectory}" "${dataDirectory}" echo done exit 0 -fi - -echo installing all... - -if [ -z "${1}" ] +elif [ "${1}" == "all" ] then - echo failure: build directory is not set - exit 3 -fi + if [ -z "${2}" ] + then + echo failure: build directory is not set + exit 3 + fi -if [ -z "${2}" ] -then - echo failure: binary directory is not set - exit 2 -fi + if [ -z "${3}" ] + then + echo failure: binary directory is not set + exit 2 + fi -if [ -z "${3}" ] -then - echo failure: data directory is not set - exit 1 -fi + if [ -z "${4}" ] + then + echo failure: data directory is not set + exit 1 + fi -srcdir="${PWD}" -builddir="${1}" -bindir="${2}" -datdir="${3}" + sourceDirectory="${PWD}" + buildDirectory="${2}" + binaryDirectory="${3}" + dataDirectory="${4}" -installBinary "${builddir}" "${bindir}" -installData "${srcdir}" "${datdir}" + installBinary "${buildDirectory}" "${binaryDirectory}" + installData "${sourceDirectory}" "${dataDirectory}" +fi echo done |