Find luarocks package installations in a more robust way

CI/teal_ci.sh

@@ -6,9 +6,6 @@ echo "Install Teal Cyan"
 git clone https://github.com/teal-language/cyan.git --depth 1
 cd cyan
 luarocks make cyan-dev-1.rockspec
-
-LUAROCKS=~/luarocks/bin
-export LUAROCKS
 popd
 
 scripts/generate_teal_declarations.sh ./teal_declarations

docs/source/generate_luadoc.sh

@@ -3,17 +3,16 @@
 DOCS_SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 FILES_DIR=$DOCS_SOURCE_DIR/../../files
 OUTPUT_DIR=$DOCS_SOURCE_DIR/reference/lua-scripting/generated_html
-DOCUMENTOR_PATH=~/.luarocks/bin/openmwluadocumentor
 
-if [ ! -x $DOCUMENTOR_PATH ]; then
+PATH=$PATH:~/lua-5.1.5/src
+eval "$(luarocks path)"
+
+if [ ! command -v openmwluadocumentor &> /dev/null ]; then
     if [ -f /.dockerenv ] || [ -f /home/docs/omw_luadoc_docker ]; then
         ./install_luadocumentor_in_docker.sh
-    else
-        # running on Windows?
-        DOCUMENTOR_PATH="$APPDATA/LuaRocks/bin/openmwluadocumentor.bat"
     fi
 fi
-if [ ! -x $DOCUMENTOR_PATH ]; then
+if [ ! command -v openmwluadocumentor &> /dev/null ]; then
     echo "openmwluadocumentor not found; See README.md for installation instructions."
     exit
 fi
@@ -23,9 +22,9 @@ rm -f $OUTPUT_DIR/*.html
 data_paths=$($DOCS_SOURCE_DIR/luadoc_data_paths.sh)
 
 cd $FILES_DIR/lua_api
-$DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR openmw/*lua
+openmwluadocumentor -f doc -d $OUTPUT_DIR openmw/*lua
 cd $FILES_DIR/data
 for path in $data_paths
 do
-  $DOCUMENTOR_PATH -f doc -d $OUTPUT_DIR $path
+  openmwluadocumentor -f doc -d $OUTPUT_DIR $path
 done

scripts/generate_teal_declarations.sh

@@ -1,8 +1,3 @@
-if [ -z "$LUAROCKS" ]; then
-  echo "Requires the LUAROCKS variable to be set to the luarocks/bin directory, e. g. `~/.luarocks/bin`"
-  exit
-fi
-
 if [ -z "$1" ]; then
   echo "Takes a path to the output directory as the argument"
   exit
@@ -13,8 +8,9 @@ OPENMW_DIR=$(realpath $SCRIPTS_DIR/..)
 DOCS_DIR=$(realpath $OPENMW_DIR/docs)
 FILES_DIR=$(realpath $OPENMW_DIR/files)
 OUTPUT_DIR=$(realpath "$1")
-DOCUMENTOR_PATH=$LUAROCKS/openmwluadocumentor
+
-TEAL_PATH=$LUAROCKS/cyan
+PATH=$PATH:~/lua-5.1.5/src
+eval "$(luarocks path)"
 
 rm -rf $OUTPUT_DIR
 mkdir $OUTPUT_DIR
@@ -24,7 +20,7 @@ build_path() {
   for file in $1
   do
     mkdir -p $OUTPUT_DIR/$(dirname $file)
-    $DOCUMENTOR_PATH -f teal -d "$OUTPUT_DIR" $file
+    openmwluadocumentor -f teal -d "$OUTPUT_DIR" $file
   done
 }
 
@@ -45,4 +41,4 @@ rm -r lua_api
 mv data/* ./
 rm -r data
 
-"$TEAL_PATH" check **/*.d.tl
+cyan check **/*.d.tl