Merge pull request #8405 from moviuro/posix-compliance

POSIX compliance
This commit is contained in:
Oliver Brakmann
2015-06-06 17:42:26 +02:00
5 changed files with 14 additions and 14 deletions

View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
# example launch script, see https://github.com/OpenRA/OpenRA/wiki/Dedicated for details # example launch script, see https://github.com/OpenRA/OpenRA/wiki/Dedicated for details
Name="Dedicated Server" Name="Dedicated Server"
Mod="ra" Mod="ra"

View File

@@ -1,18 +1,18 @@
#!/bin/bash #!/bin/sh
# Use Linux system dependencies where possible, but take into account different .so names. # Use Linux system dependencies where possible, but take into account different .so names.
os=`uname` os="$(uname -s)"
if [ "$os" == 'Linux' ]; then if [ "$os" = 'Linux' ] || [ "$os" = 'FreeBSD' ]; then
locations=(/lib /lib64 /usr/lib /usr/lib64 /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu /usr/local/lib /opt/lib) locations="/lib /lib64 /usr/lib /usr/lib64 /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu /usr/local/lib /opt/lib"
sonames=(liblua.so.5.1.5 liblua5.1.so.5.1 liblua5.1.so.0 liblua.so.5.1 liblua-5.1.so liblua5.1.so) sonames="liblua.so.5.1.5 liblua5.1.so.5.1 liblua5.1.so.0 liblua.so.5.1 liblua-5.1.so liblua5.1.so"
if [ -f Eluant.dll.config ]; then if [ -f Eluant.dll.config ]; then
exit 0 exit 0
fi fi
for location in "${locations[@]}" ; do for location in $locations ; do
for soname in ${sonames[@]} ; do for soname in $sonames ; do
if [ -f $location/$soname ]; then if [ -f "$location/$soname" ]; then
liblua51=$soname liblua51=$soname
echo "Detected Lua 5.1 library at "$location/$soname echo "Detected Lua 5.1 library at "$location/$soname
break 2 break 2

View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
# Die on any error for Travis CI to automatically retry: # Die on any error for Travis CI to automatically retry:
set -e set -e
@@ -10,7 +10,7 @@ cd "${download_dir}"
filename="GeoLite2-Country.mmdb.gz" filename="GeoLite2-Country.mmdb.gz"
# Database does not exist or is older than 30 days. # Database does not exist or is older than 30 days.
if [[ ! -e $filename ]] || [[ -n $(find . -name $filename -mtime +30 -print) ]]; then if [ ! -e $filename ] || [ -n "$(find . -name $filename -mtime +30 -print)" ]; then
rm -f $filename rm -f $filename
echo "Updating GeoIP country database from MaxMind." echo "Updating GeoIP country database from MaxMind."
curl -s -L -O http://geolite.maxmind.com/download/geoip/database/$filename curl -s -L -O http://geolite.maxmind.com/download/geoip/database/$filename

View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
# Die on any error for Travis CI to automatically retry: # Die on any error for Travis CI to automatically retry:
set -e set -e
@@ -8,7 +8,7 @@ download_dir="${0%/*}/download"
mkdir -p "${download_dir}" mkdir -p "${download_dir}"
cd "${download_dir}" cd "${download_dir}"
function get() get()
{ {
if which nuget >/dev/null; then if which nuget >/dev/null; then
nuget install $1 -Version $2 -ExcludeVersion nuget install $1 -Version $2 -ExcludeVersion

2
thirdparty/noget.sh vendored
View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
# fallback without dependency resolution if nuget is not present on the system # fallback without dependency resolution if nuget is not present on the system
archive="$1" archive="$1"