From ba733b62a0033d742e20753b32b810d6269d2863 Mon Sep 17 00:00:00 2001 From: slava Date: Thu, 24 Mar 2016 20:15:07 +0300 Subject: [PATCH] Use more reliable way to check 'fpm' gem presence Change-Id: I9074472ba40747be5b7bf055d503564eaada4279 Closes-bug: #1561069 --- examples/fuel_plugin_example_v1/pre_build_hook | 4 ++++ examples/fuel_plugin_example_v2/pre_build_hook | 4 ++++ examples/fuel_plugin_example_v2_update/pre_build_hook | 4 ++++ examples/fuel_plugin_example_v3/pre_build_hook | 4 ++++ examples/fuel_plugin_example_v4/pre_build_hook | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/examples/fuel_plugin_example_v1/pre_build_hook b/examples/fuel_plugin_example_v1/pre_build_hook index 3530308..c556d17 100755 --- a/examples/fuel_plugin_example_v1/pre_build_hook +++ b/examples/fuel_plugin_example_v1/pre_build_hook @@ -5,6 +5,10 @@ command -v fpm >/dev/null 2>&1 || { echo >&2 "Install 'fpm' to build this plugin. Aborting."; exit 1; } +ruby -e "require 'fpm'" 2>&1 || { + echo >&2 "'Fpm' binary file is present, but gem seems to be broken! Aborting."; exit 1; +} + ROOT=$(dirname `readlink -f $0`) UBUNTU_REPO_PATH=$ROOT/repositories/ubuntu diff --git a/examples/fuel_plugin_example_v2/pre_build_hook b/examples/fuel_plugin_example_v2/pre_build_hook index 66c39b0..9787c03 100755 --- a/examples/fuel_plugin_example_v2/pre_build_hook +++ b/examples/fuel_plugin_example_v2/pre_build_hook @@ -5,6 +5,10 @@ command -v fpm >/dev/null 2>&1 || { echo >&2 "Install 'fpm' to build this plugin. Aborting."; exit 1; } +ruby -e "require 'fpm'" 2>&1 || { + echo >&2 "'Fpm' binary file is present, but gem seems to be broken! Aborting."; exit 1; +} + ROOT=$(dirname `readlink -f $0`) UBUNTU_REPO_PATH=$ROOT/repositories/ubuntu diff --git a/examples/fuel_plugin_example_v2_update/pre_build_hook b/examples/fuel_plugin_example_v2_update/pre_build_hook index fa8c169..381a309 100755 --- a/examples/fuel_plugin_example_v2_update/pre_build_hook +++ b/examples/fuel_plugin_example_v2_update/pre_build_hook @@ -5,6 +5,10 @@ command -v fpm >/dev/null 2>&1 || { echo >&2 "Install 'fpm' to build this plugin. Aborting."; exit 1; } +ruby -e "require 'fpm'" 2>&1 || { + echo >&2 "'Fpm' binary file is present, but gem seems to be broken! Aborting."; exit 1; +} + ROOT=$(dirname `readlink -f $0`) UBUNTU_REPO_PATH=$ROOT/repositories/ubuntu diff --git a/examples/fuel_plugin_example_v3/pre_build_hook b/examples/fuel_plugin_example_v3/pre_build_hook index 49dafe9..93df91b 100755 --- a/examples/fuel_plugin_example_v3/pre_build_hook +++ b/examples/fuel_plugin_example_v3/pre_build_hook @@ -5,6 +5,10 @@ command -v fpm >/dev/null 2>&1 || { echo >&2 "Install 'fpm' to build this plugin. Aborting."; exit 1; } +ruby -e "require 'fpm'" 2>&1 || { + echo >&2 "'Fpm' binary file is present, but gem seems to be broken! Aborting."; exit 1; +} + ROOT=$(dirname `readlink -f $0`) UBUNTU_REPO_PATH=$ROOT/repositories/ubuntu diff --git a/examples/fuel_plugin_example_v4/pre_build_hook b/examples/fuel_plugin_example_v4/pre_build_hook index db14c50..519416c 100755 --- a/examples/fuel_plugin_example_v4/pre_build_hook +++ b/examples/fuel_plugin_example_v4/pre_build_hook @@ -5,6 +5,10 @@ command -v fpm >/dev/null 2>&1 || { echo >&2 "Install 'fpm' to build this plugin. Aborting."; exit 1; } +ruby -e "require 'fpm'" 2>&1 || { + echo >&2 "'Fpm' binary file is present, but gem seems to be broken! Aborting."; exit 1; +} + ROOT=$(dirname `readlink -f $0`) UBUNTU_REPO_PATH=$ROOT/repositories/ubuntu