Skip to content
This repository was archived by the owner on Apr 14, 2022. It is now read-only.

Commit 3c1d583

Browse files
committed
Review fixes #1.
1 parent a2e0cae commit 3c1d583

File tree

3 files changed

+8
-21
lines changed

3 files changed

+8
-21
lines changed

graphql/accessor_general.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
---
44
--- It provides basic logic for such space-like data storages and abstracted
55
--- away from details from where tuples are arrived into the application.
6-
package.cpath = package.cpath .. ";/usr/share/tarantool/pcre2/?.so"
76

87
local ffi = require('ffi')
98
local json = require('json')

graphql/core/parse.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
package.path = package.path .. ";/usr/share/tarantool/lulpeg/?.lua"
21
local lpeg = require 'lulpeg'
32
local P, R, S, V = lpeg.P, lpeg.R, lpeg.S, lpeg.V
43
local C, Ct, Cmt, Cg, Cc, Cf, Cmt = lpeg.C, lpeg.Ct, lpeg.Cmt, lpeg.Cg, lpeg.Cc, lpeg.Cf, lpeg.Cmt

tools/ubuntu.trusty.test.sh

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,22 @@
22

33
set -euxo pipefail # Strict shell
44

5-
#sudo apt-get -qq update
6-
#curl http://download.tarantool.org/tarantool/1.9/gpgkey |
7-
#sudo apt-key add -release=`lsb_release -c -s`
8-
9-
# install https download transport for APT
10-
#sudo apt-get -y install apt-transport-https
11-
12-
#curl -s https://packagecloud.io/install/repositories/tarantool/1_7/script.deb.sh | sudo bash
13-
#sudo apt-get update > /dev/null
14-
#sudo apt-get -q -y install tarantool tarantool-dev
15-
165
sudo apt-get -qq update
17-
curl http://download.tarantool.org/tarantool/1.9/gpgkey |
18-
sudo apt-key add -release=`lsb_release -c -s`
6+
curl http://download.tarantool.org/tarantool/1.9/gpgkey | \
7+
sudo apt-key add -
8+
release=`lsb_release -c -s`
199

2010
# install https download transport for APT
2111
sudo apt-get -y install apt-transport-https
2212

2313
# append two lines to a list of source repositories
2414
sudo rm -f /etc/apt/sources.list.d/*tarantool*.list
25-
echo "deb http://download.tarantool.org/tarantool/1.9/ubuntu/ trusty main" |
26-
sudo tee /etc/apt/sources.list.d/tarantool_1_9.list
27-
echo "deb-src http://download.tarantool.org/tarantool/1.9/ubuntu/ trusty main" |
28-
sudo tee -a /etc/apt/sources.list.d/tarantool_1_9.list
15+
echo "deb http://download.tarantool.org/tarantool/1.9/ubuntu/ ${release} main" | \
16+
sudo tee /etc/apt/sources.list.d/tarantool_1_9.list
17+
echo "deb-src http://download.tarantool.org/tarantool/1.9/ubuntu/ ${release} main" | \
18+
sudo tee -a /etc/apt/sources.list.d/tarantool_1_9.list
2919

30-
sudo apt-get update > /dev/null
20+
sudo apt-get update
3121
sudo apt-get -q -y install tarantool tarantool-dev
3222

3323
cd ..
@@ -45,7 +35,6 @@ tarantoolctl rocks install shard "${SHARD_VERSION}"
4535
tarantoolctl rocks install avro-schema "${AVRO_SCHEMA}"
4636
cd ..
4737
# lua (with dev headers) is necessary for luacheck
48-
# maybe we can use tarantool headers?
4938
sudo apt-get install lua5.1
5039
sudo apt-get install liblua5.1-0-dev
5140
wget "http://luarocks.github.io/luarocks/releases/luarocks-2.4.4.tar.gz"

0 commit comments

Comments
 (0)