Skip to content
This repository has been archived by the owner on Apr 15, 2019. It is now read-only.

Commit

Permalink
Use static jq binary
Browse files Browse the repository at this point in the history
  • Loading branch information
francoilol committed Oct 12, 2018
1 parent 9709a0d commit e746f78
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 29 deletions.
36 changes: 12 additions & 24 deletions build.sh
Expand Up @@ -64,24 +64,10 @@ if [ ! -f "$LISK_FILE" ]; then
fi

echo
echo "Downloading and building jq..."
echo "Downloading jq..."
echo "--------------------------------------------------------------------------"
[[ -f "$JQ_FILE" ]] || wget -nv "$JQ_URL" --output-document="$JQ_FILE"
[[ -f "$JQ_FILE" ]] || wget -nv "$JQ_BIN_URL" --output-document="$JQ_FILE"
echo "$JQ_SHA256SUM $JQ_FILE" |sha256sum -c
if [ ! -f "$JQ_DIR/finished" ]; then
rm -rf $JQ_DIR
tar xf $JQ_FILE
pushd "$JQ_DIR"
./configure --disable-docs
# ensure oniguruma is not used
grep --quiet 'ac_cv_header_oniguruma_h=no' config.log
make
# https://github.com/stedolan/jq/issues/1091
sed --in-place 's# tests/onigtest##' Makefile
make check
touch finished
popd
fi

echo
echo "Downloading and building redis..."
Expand Down Expand Up @@ -141,7 +127,9 @@ if [ ! -f "$BUILD_NAME/finished" ]; then
mkdir -p "$BUILD_NAME/redis"

# copy jq binary
cp -f "$JQ_DIR/$JQ_OUT" "$BUILD_NAME/bin/$JQ_OUT"
cp -f "$JQ_FILE" "$BUILD_NAME/bin/$JQ_FILE"
strip "$BUILD_NAME/bin/$JQ_FILE"
chmod +x "$BUILD_NAME/bin/$JQ_FILE"

# copy lisk "packaged" scripts
cp -vrf "$LISK_SCRIPTS_DIR/packaged/"* "$BUILD_NAME"
Expand All @@ -162,13 +150,13 @@ if [ ! -f "$BUILD_NAME/finished" ]; then
echo "Creating etc/snapshot.json..."
echo "--------------------------------------------------------------------------"
cp config.json etc/snapshot.json
"./bin/$JQ_OUT" '.httpPort=9000' etc/snapshot.json |sponge etc/snapshot.json
"./bin/$JQ_OUT" '.wsPort=9001' etc/snapshot.json |sponge etc/snapshot.json
"./bin/$JQ_OUT" '.logFileName="logs/lisk_snapshot.log"' etc/snapshot.json |sponge etc/snapshot.json
"./bin/$JQ_OUT" '.fileLogLevel="info"' etc/snapshot.json |sponge etc/snapshot.json
"./bin/$JQ_OUT" '.db.database="lisk_snapshot"' etc/snapshot.json |sponge etc/snapshot.json
"./bin/$JQ_OUT" '.peers.list=[]' etc/snapshot.json |sponge etc/snapshot.json
"./bin/$JQ_OUT" '.loading.loadPerIteration=101' etc/snapshot.json |sponge etc/snapshot.json
"./bin/$JQ_FILE" '.httpPort=9000' etc/snapshot.json |sponge etc/snapshot.json
"./bin/$JQ_FILE" '.wsPort=9001' etc/snapshot.json |sponge etc/snapshot.json
"./bin/$JQ_FILE" '.logFileName="logs/lisk_snapshot.log"' etc/snapshot.json |sponge etc/snapshot.json
"./bin/$JQ_FILE" '.fileLogLevel="info"' etc/snapshot.json |sponge etc/snapshot.json
"./bin/$JQ_FILE" '.db.database="lisk_snapshot"' etc/snapshot.json |sponge etc/snapshot.json
"./bin/$JQ_FILE" '.peers.list=[]' etc/snapshot.json |sponge etc/snapshot.json
"./bin/$JQ_FILE" '.loading.loadPerIteration=101' etc/snapshot.json |sponge etc/snapshot.json

echo "Installing lisk..."
echo "--------------------------------------------------------------------------"
Expand Down
8 changes: 3 additions & 5 deletions config.sh
Expand Up @@ -65,11 +65,9 @@ REDIS_SERVER_OUT="redis-server"
REDIS_SERVER_CLI="redis-cli"

JQ_VERSION="1.5"
JQ_SHA256SUM="c4d2bfec6436341113419debf479d833692cc5cdab7eb0326b5a4d4fbe9f493c"
JQ_DIR="jq-$JQ_VERSION"
JQ_FILE="$JQ_DIR.tar.gz"
JQ_URL="https://github.com/stedolan/jq/releases/download/jq-$JQ_VERSION/$JQ_FILE"
JQ_OUT="jq"
JQ_SHA256SUM="c6b3a7d7d3e7b70c6f51b706a3b90bd01833846c54d32ca32f0027f00226ff6d"
JQ_BIN_URL="https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64"
JQ_FILE="jq"

NPM_CLI="$BUILD_NAME/lib/node_modules/npm/bin/npm-cli.js"

Expand Down

0 comments on commit e746f78

Please sign in to comment.