Skip to content

Commit e5b759e

Browse files
authored
Merge pull request #13 from teckel12/development
Development
2 parents 89f3768 + 8cab236 commit e5b759e

File tree

3 files changed

+22
-21
lines changed

3 files changed

+22
-21
lines changed

Diff for: .travis.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
os:
2-
- linux
2+
- linux
33

44
sudo: false
55

66
dist: trusty
77

88
addons:
9-
apt:
10-
packages:
11-
- lua5.2
9+
apt:
10+
packages:
11+
- lua5.2
1212

1313
git:
14-
depth: 5
14+
depth: 5
1515

1616
language: c
1717

1818
install:
1919

20-
script: ./bin/build.sh
20+
script: ./bin/build.sh

Diff for: SCRIPTS/TELEMETRY/VTx.lua

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
-- Home path
12
SCRIPT_HOME = "/SCRIPTS/TELEMETRY/VTx"
23

34
LOCAL_SENSOR_ID = 0x0D

Diff for: bin/build.sh

100644100755
+15-15
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
#!/bin/bash
22

33
if [ -d obj ]; then
4-
rm -fR obj/*
4+
rm -fR obj/*
55
else
6-
mkdir obj
6+
mkdir obj
77
fi
88

9-
cp -fR src/* obj
9+
cp -fR SCRIPTS/TELEMETRY/* obj
1010

1111
MANIFEST=(`find obj/ -name *.lua -type f`);
1212
LAST_FAILURE=0
1313

1414
if [ ${#MANIFEST[@]} -eq 0 ]; then
15-
echo -e "\e[1m\e[39m[\e[31mTEST FAILED\e[39m]\e[21m No scripts could be found!."
16-
exit 1
15+
echo -e "\e[1m\e[39m[\e[31mTEST FAILED\e[39m]\e[21m No scripts could be found!."
16+
exit 1
1717
fi
1818

1919
for f in ${MANIFEST[@]};
2020
do
21-
SRC_NAME=$f
22-
OBJ_NAME=$(dirname ${f})/$(basename ${f} .lua).luac
23-
echo -e "Compiling file \e[1m${SRC_NAME}\e[21m..."
24-
luac -s -o ${OBJ_NAME} ${SRC_NAME}
25-
_fail=$?
26-
if [[ $_fail -ne 0 ]]; then
27-
LAST_FAILURE=$_fail
28-
echo -e "\e[1m\e[39m[\e[31mBUILD FAILED\e[39m]\e[21m Compilation error in file ${SRC_NAME}\e[1m"
29-
fi
21+
SRC_NAME=$f
22+
OBJ_NAME=$(dirname ${f})/$(basename ${f} .lua).luac
23+
echo -e "Compiling file \e[1m${SRC_NAME}\e[21m..."
24+
luac -s -o ${OBJ_NAME} ${SRC_NAME}
25+
_fail=$?
26+
if [[ $_fail -ne 0 ]]; then
27+
LAST_FAILURE=$_fail
28+
echo -e "\e[1m\e[39m[\e[31mBUILD FAILED\e[39m]\e[21m Compilation error in file ${SRC_NAME}\e[1m"
29+
fi
3030
done
3131

3232
if [[ $LAST_FAILURE -eq 0 ]]; then
33-
echo -e "\e[1m\e[39m[\e[32mTEST SUCCESSFUL\e[39m]\e[21m All lua files built successfully!"
33+
echo -e "\e[1m\e[39m[\e[32mTEST SUCCESSFUL\e[39m]\e[21m All lua files built successfully!"
3434
fi
3535
exit $LAST_FAILURE

0 commit comments

Comments
 (0)