Skip to content

Commit fc04e62

Browse files
authored
Merge pull request #106 from atb00ker/setup-bug
[setup] fixed install & runtests scripts
2 parents 9b4dd9b + 677affd commit fc04e62

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

install-dev.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ apt-get install -y cmake git-core
99
apt-get install -y lua5.1 liblua5.1-0-dev luarocks
1010
# install json-c
1111
apt-get install -y dh-autoreconf
12-
git clone https://github.com/json-c/json-c.git --depth=1 && cd json-c
13-
sh autogen.sh && ./configure && make && make install && cd ..
12+
git clone https://github.com/json-c/json-c.git --depth=1
13+
cd json-c && cmake . && make install && cd .. || { echo 'Installing json-c failed!' ; exit 1; }
1414
# install openwrt libubox and uci
15-
git clone https://git.openwrt.org/project/libubox.git --depth=1 && cd libubox
16-
cmake . && make install && cd ..
17-
git clone https://git.openwrt.org/project/uci.git --depth=1 && cd uci
18-
cmake . && make install && cd ..
15+
git clone https://git.openwrt.org/project/libubox.git --depth=1
16+
cd libubox && cmake . && make install && cd .. || { echo 'Installing libubox failed!' ; exit 1; }
17+
git clone https://git.openwrt.org/project/uci.git --depth=1
18+
cd uci && cmake . && make install && cd .. || { echo 'Installing uci failed!' ; exit 1; }
1919
# update links to shared libraries
2020
ldconfig -v
2121
# install luafilesystem

runtests

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
set -e
3-
luacheck . -a
3+
luacheck ./openwisp-config/ -a
44
cd openwisp-config/tests/
55
lua test_store_unmanaged.lua -v
66
lua test_restore_unmanaged.lua -v

0 commit comments

Comments
 (0)