summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonwarez <monwarez@gmail.com>2016-11-26 02:28:56 +0100
committerThibault Payet <monwarez@gmail.com>2017-07-26 00:18:53 +0200
commitbc0e4eb01ce8ddba0f8e8b12c9bed9e50e8afc40 (patch)
tree09b7c88e828e3dd779658cc575df3e26c66696b6
parente56a2a0f64c12f9fbeaccfa378fcddfb3620e74d (diff)
downloadevol-tools-bc0e4eb01ce8ddba0f8e8b12c9bed9e50e8afc40.tar.gz
evol-tools-bc0e4eb01ce8ddba0f8e8b12c9bed9e50e8afc40.tar.bz2
evol-tools-bc0e4eb01ce8ddba0f8e8b12c9bed9e50e8afc40.tar.xz
evol-tools-bc0e4eb01ce8ddba0f8e8b12c9bed9e50e8afc40.zip
use env instead of full path to bash
-rwxr-xr-xbuild/chroot-server-build.sh2
-rwxr-xr-xbuild/server-bin.sh2
-rwxr-xr-xci/install.sh2
-rwxr-xr-xhercules/import_newdb.sh2
-rwxr-xr-xhercules_update/createnew.sh2
-rwxr-xr-xherculesversion/allversions.sh2
-rwxr-xr-xherculeswrapper/char.sh2
-rw-r--r--herculeswrapper/include.sh2
-rwxr-xr-xherculeswrapper/login.sh2
-rwxr-xr-xherculeswrapper/map.sh2
-rwxr-xr-ximagescheck/icccheck.sh2
-rwxr-xr-ximagescheck/icccheckfile.sh2
-rwxr-xr-xlang_client/createpots.sh2
-rwxr-xr-xlang_client/processtmx.sh2
-rwxr-xr-xlicensecheck/checkfile.sh2
-rwxr-xr-xlicensecheck/clientdata.sh2
-rwxr-xr-xlocalserver/build.sh2
-rwxr-xr-xlocalserver/buildasan.sh2
-rwxr-xr-xlocalserver/clean.sh2
-rwxr-xr-xlocalserver/givegm.sh2
-rwxr-xr-xlocalserver/initdb.sh2
-rwxr-xr-xlocalserver/installconfigs.sh2
-rwxr-xr-xlocalserver/updateconfigs.sh2
-rwxr-xr-xlocalserver/updatedb.sh2
-rwxr-xr-xmanaplus/connect_local_server.sh2
-rwxr-xr-xscript-doc/script-doc.sh2
-rwxr-xr-xtestxml/xsd/checkfile.sh2
-rwxr-xr-xtestxml/xsdcheck.sh2
-rwxr-xr-xupdate/addmods.sh2
-rwxr-xr-xupdate/create_music.sh4
-rwxr-xr-xupdate/createnew.sh4
-rwxr-xr-xupdate/update.sh2
-rwxr-xr-xupdate/update_music.sh2
33 files changed, 35 insertions, 35 deletions
diff --git a/build/chroot-server-build.sh b/build/chroot-server-build.sh
index 3cc5c87..dd2cd0b 100755
--- a/build/chroot-server-build.sh
+++ b/build/chroot-server-build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
export CHROOT="$1"
export NAME=lenny
diff --git a/build/server-bin.sh b/build/server-bin.sh
index f3cb9fa..f5084f2 100755
--- a/build/server-bin.sh
+++ b/build/server-bin.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
export LOCALDIR="../server-local/bin"
cd ../../server-code
diff --git a/ci/install.sh b/ci/install.sh
index 409ff81..0dd41b6 100755
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
function aptget_update {
apt-get update
diff --git a/hercules/import_newdb.sh b/hercules/import_newdb.sh
index 3625245..ba81d4f 100755
--- a/hercules/import_newdb.sh
+++ b/hercules/import_newdb.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
export CMD="$*"
diff --git a/hercules_update/createnew.sh b/hercules_update/createnew.sh
index cfa0eba..1274792 100755
--- a/hercules_update/createnew.sh
+++ b/hercules_update/createnew.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# Copyright (C) 2011-2014 Evol Online
# Author: Andrei Karas (4144)
diff --git a/herculesversion/allversions.sh b/herculesversion/allversions.sh
index 7448b00..324ccf4 100755
--- a/herculesversion/allversions.sh
+++ b/herculesversion/allversions.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
function gendiff {
./packetversion.py "${1}" "${2}" > "${1}_${2}.txt"
diff --git a/herculeswrapper/char.sh b/herculeswrapper/char.sh
index cdca266..2b794d9 100755
--- a/herculeswrapper/char.sh
+++ b/herculeswrapper/char.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
export PIPE=./log/charpipe.tmp
diff --git a/herculeswrapper/include.sh b/herculeswrapper/include.sh
index aecb988..4ee3750 100644
--- a/herculeswrapper/include.sh
+++ b/herculeswrapper/include.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
function create_pipe {
trap "rm -f $PIPE" EXIT
diff --git a/herculeswrapper/login.sh b/herculeswrapper/login.sh
index ae67bf8..32085dd 100755
--- a/herculeswrapper/login.sh
+++ b/herculeswrapper/login.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
export PIPE=./log/loginpipe.tmp
diff --git a/herculeswrapper/map.sh b/herculeswrapper/map.sh
index 18994e2..055acd7 100755
--- a/herculeswrapper/map.sh
+++ b/herculeswrapper/map.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
export PIPE=./log/mappipe.tmp
export LOGIN_PIPE=./log/loginpipe.tmp
diff --git a/imagescheck/icccheck.sh b/imagescheck/icccheck.sh
index f9cdc72..6ca1481 100755
--- a/imagescheck/icccheck.sh
+++ b/imagescheck/icccheck.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
export DIR="../../client-data"
diff --git a/imagescheck/icccheckfile.sh b/imagescheck/icccheckfile.sh
index 8f998c0..dbdfb23 100755
--- a/imagescheck/icccheckfile.sh
+++ b/imagescheck/icccheckfile.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
identify -verbose $1 | egrep -i "profile|iCCP" >/dev/null
diff --git a/lang_client/createpots.sh b/lang_client/createpots.sh
index feb44fd..397489f 100755
--- a/lang_client/createpots.sh
+++ b/lang_client/createpots.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
function its {
itstool -o ../tools/lang_client/pot/$1.pot $1.xml
diff --git a/lang_client/processtmx.sh b/lang_client/processtmx.sh
index 235eef4..5fc80aa 100755
--- a/lang_client/processtmx.sh
+++ b/lang_client/processtmx.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
export name=$1
export name=${name##*/}
diff --git a/licensecheck/checkfile.sh b/licensecheck/checkfile.sh
index 4b7a9d9..1a32edc 100755
--- a/licensecheck/checkfile.sh
+++ b/licensecheck/checkfile.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
export name="$2"
export name=${name##../../client-data/}
diff --git a/licensecheck/clientdata.sh b/licensecheck/clientdata.sh
index cf63fa8..5abec23 100755
--- a/licensecheck/clientdata.sh
+++ b/licensecheck/clientdata.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
export DIR="../../client-data"
diff --git a/localserver/build.sh b/localserver/build.sh
index aa7fbb6..ee8a93c 100755
--- a/localserver/build.sh
+++ b/localserver/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
export DIR=`pwd`
source ./clean.sh
diff --git a/localserver/buildasan.sh b/localserver/buildasan.sh
index c433ce8..5c6d9f7 100755
--- a/localserver/buildasan.sh
+++ b/localserver/buildasan.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
export DIR=`pwd`
source ./clean.sh
diff --git a/localserver/clean.sh b/localserver/clean.sh
index fbd884b..134f5cb 100755
--- a/localserver/clean.sh
+++ b/localserver/clean.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
rm -rf ../../server-code/src/evol/build/
mkdir ../../server-code/src/evol/build/
diff --git a/localserver/givegm.sh b/localserver/givegm.sh
index c1a9c28..ac9d301 100755
--- a/localserver/givegm.sh
+++ b/localserver/givegm.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
ID="$1"
if [[ -z "${ID}" ]]; then
diff --git a/localserver/initdb.sh b/localserver/initdb.sh
index cd8557a..7c99524 100755
--- a/localserver/initdb.sh
+++ b/localserver/initdb.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
export DIR="$(pwd)"
export VER=$(cat versions/sqlver 2>/dev/null)
diff --git a/localserver/installconfigs.sh b/localserver/installconfigs.sh
index 4e08c8f..095c074 100755
--- a/localserver/installconfigs.sh
+++ b/localserver/installconfigs.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
export SD="../../server-data"
export CONF="$SD/conf/import"
diff --git a/localserver/updateconfigs.sh b/localserver/updateconfigs.sh
index 2e85481..dc804b8 100755
--- a/localserver/updateconfigs.sh
+++ b/localserver/updateconfigs.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
export VER=$(cat versions/confver 2>/dev/null)
export CONFDIR="../../server-data/"
diff --git a/localserver/updatedb.sh b/localserver/updatedb.sh
index ee58056..f13d8d0 100755
--- a/localserver/updatedb.sh
+++ b/localserver/updatedb.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
export VER=$(cat versions/sqlver 2>/dev/null)
export SQLDIR="../../server-data/sql-files/upgrades"
diff --git a/manaplus/connect_local_server.sh b/manaplus/connect_local_server.sh
index ccc155e..9ba756e 100755
--- a/manaplus/connect_local_server.sh
+++ b/manaplus/connect_local_server.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
export MANAPLUS="../../manaplus/src/manaplus"
if [ -f "$MANAPLUS" ]; then
diff --git a/script-doc/script-doc.sh b/script-doc/script-doc.sh
index 07690c9..ecde968 100755
--- a/script-doc/script-doc.sh
+++ b/script-doc/script-doc.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# (c) Evol Online 2016
# Author: Reid
diff --git a/testxml/xsd/checkfile.sh b/testxml/xsd/checkfile.sh
index e03c4da..90df1f1 100755
--- a/testxml/xsd/checkfile.sh
+++ b/testxml/xsd/checkfile.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
xmllint --format --schema tmw.xsd "${1}" 2>&1 >/dev/null | \
grep -v ": Skipping import of schema located at " | \
diff --git a/testxml/xsdcheck.sh b/testxml/xsdcheck.sh
index e9b5563..6fea514 100755
--- a/testxml/xsdcheck.sh
+++ b/testxml/xsdcheck.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
cd xsd
DIR="$(pwd)/../../../client-data"
diff --git a/update/addmods.sh b/update/addmods.sh
index 6a4b1c0..3a4e036 100755
--- a/update/addmods.sh
+++ b/update/addmods.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# Copyright (C) 2010-2012 Evol Online
# Author: Andrei Karas (4144)
diff --git a/update/create_music.sh b/update/create_music.sh
index db82b2f..63e969e 100755
--- a/update/create_music.sh
+++ b/update/create_music.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# Copyright (C) 2011-2012 Evol Online
# Author: Andrei Karas (4144)
@@ -27,4 +27,4 @@ cat xml_footer.txt >>resources.xml
cp music.zip ../upload/
cp resources.xml ../upload/
-cp ../news.txt ../upload/ \ No newline at end of file
+cp ../news.txt ../upload/
diff --git a/update/createnew.sh b/update/createnew.sh
index 535ea81..86a6b93 100755
--- a/update/createnew.sh
+++ b/update/createnew.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# Copyright (C) 2011-2012 Evol Online
# Author: Andrei Karas (4144)
@@ -32,4 +32,4 @@ cat xml_footer.txt >>resources.xml
cp evol.zip ../upload/
cp resources2.txt ../upload/
cp resources.xml ../upload/
-cp ../news.txt ../upload/ \ No newline at end of file
+cp ../news.txt ../upload/
diff --git a/update/update.sh b/update/update.sh
index e092464..01dab51 100755
--- a/update/update.sh
+++ b/update/update.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# Copyright (C) 2010-2012 Evol Online
# Author: Andrei Karas (4144)
diff --git a/update/update_music.sh b/update/update_music.sh
index a74e15a..aca1506 100755
--- a/update/update_music.sh
+++ b/update/update_music.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# Copyright (C) 2010-2012 Evol Online
# Author: Andrei Karas (4144)