Merge remote-tracking branch 'upstream/master' into floattitlefloattitle

1 files changed, 52 insertions, 50 deletions

diff --git a/scripts/lua2dox_filter b/scripts/lua2dox_filter
index 22484a807f..e3fa95d0cf 100755
--- a/scripts/lua2dox_filter
+++ b/scripts/lua2dox_filter
@@ -22,67 +22,69 @@
 LANG=""
 
 ##! \brief test executable to see if it exists
-test_executable(){
-	P_EXE="$1"
-	#########
-	WHICH=`which ${P_EXE}`
-	if test -z "${WHICH}"
-	then
-		echo "not found \"${P_EXE}\""
-	else
-		EXE="${P_EXE}"
-	fi
-	}
+test_executable() {
+  P_EXE="$1"
+  #########
+  WHICH=$(which "$P_EXE")
+  if test -z "${WHICH}"; then
+    echo "not found \"${P_EXE}\""
+  else
+    EXE="${P_EXE}"
+  fi
+}
 
 ##! \brief sets the lua interpreter
-set_lua(){
-	if test -z "${EXE}"; then
-		test_executable 'luajit'
-	fi
+set_lua() {
+  if test -z "${EXE}"; then
+    test_executable '.deps/usr/bin/luajit'
+  fi
+
+  if test -z "${EXE}"; then
+    test_executable 'luajit'
+  fi
 
-	if test -z "${EXE}"; then
-		test_executable 'lua'
-	fi
+  if test -z "${EXE}"; then
+    test_executable 'lua'
+  fi
 }
 
 ##! \brief makes canonical name of file
-##! 
+##!
 ##! Note that "readlink -f" doesn't work in MacOSX
-##! 
-do_readlink(){
-	pushd . > /dev/null
-	TARGET_FILE=$1
-	
-	cd `dirname $TARGET_FILE`
-	TARGET_FILE=`basename $TARGET_FILE`
-	
-	# Iterate down a (possible) chain of symlinks
-	while [ -L "$TARGET_FILE" ]
-	do
-		TARGET_FILE=`readlink $TARGET_FILE`
-		cd `dirname $TARGET_FILE`
-		TARGET_FILE=`basename $TARGET_FILE`
-	done
-	
-	PHYS_DIR=`pwd -P`
-	RESULT=$PHYS_DIR
-	popd > /dev/null
-	}
+##!
+do_readlink() {
+  pushd . > /dev/null
+  TARGET_FILE=$1
+
+  cd "$(dirname $TARGET_FILE)"
+  TARGET_FILE=$(basename "$TARGET_FILE")
+
+  # Iterate down a (possible) chain of symlinks
+  while [ -L "$TARGET_FILE" ]; do
+    TARGET_FILE=$(readlink "$TARGET_FILE")
+    cd $(dirname "$TARGET_FILE")
+    TARGET_FILE=$(basename "$TARGET_FILE")
+  done
+
+  PHYS_DIR=$(pwd -P)
+  RESULT=$PHYS_DIR
+  popd > /dev/null
+}
 
 ##main
 set_lua
-if test -z "${EXE}"
-then
-	echo "no lua interpreter available"
+if test -z "${EXE}"; then
+  echo "no lua interpreter found"
+  exit 1
 else
-	BASENAME=`basename "$0"`
-	do_readlink "$0"
-	DIRNAME="${RESULT}"
-		
-	LUASCRIPT="${DIRNAME}/lua2dox.lua ${BASENAME}"
-	#echo "lua[${LUASCRIPT}]"
+  BASENAME=$(basename "$0")
+  do_readlink "$0"
+  DIRNAME="${RESULT}"
 
-	${EXE} ${LUASCRIPT} $@
+  LUASCRIPT="${DIRNAME}/lua2dox.lua ${BASENAME}"
+  #echo "lua[${LUASCRIPT}]"
+
+  ${EXE} ${LUASCRIPT} $@
 fi
-# 
+
 ##eof