From 795fa15147e0fd0b9829e4694058a4558eea14b8 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Tue, 6 Nov 2012 10:02:12 -0300 Subject: [PATCH] fixed broken build --- .../test/resources/test_install_chef_gems_scriptbuilder.sh | 6 ++++-- .../src/test/resources/test_install_ruby_scriptbuilder.sh | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scriptbuilder/src/test/resources/test_install_chef_gems_scriptbuilder.sh b/scriptbuilder/src/test/resources/test_install_chef_gems_scriptbuilder.sh index 75247ca557..e8c8fd99bb 100644 --- a/scriptbuilder/src/test/resources/test_install_chef_gems_scriptbuilder.sh +++ b/scriptbuilder/src/test/resources/test_install_chef_gems_scriptbuilder.sh @@ -89,14 +89,16 @@ alias yum-install="yum --quiet --nogpgcheck -y install" function ensure_cmd_or_install_package_apt(){ local cmd=$1 - local pkg=$2 + shift + local pkg=$* hash $cmd 2>/dev/null || ( apt-get-update && apt-get-install $pkg ) } function ensure_cmd_or_install_package_yum(){ local cmd=$1 - local pkg=$2 + shift + local pkg=$* hash $cmd 2>/dev/null || yum-install $pkg } diff --git a/scriptbuilder/src/test/resources/test_install_ruby_scriptbuilder.sh b/scriptbuilder/src/test/resources/test_install_ruby_scriptbuilder.sh index 7011361756..a6e461b53f 100644 --- a/scriptbuilder/src/test/resources/test_install_ruby_scriptbuilder.sh +++ b/scriptbuilder/src/test/resources/test_install_ruby_scriptbuilder.sh @@ -89,14 +89,16 @@ alias yum-install="yum --quiet --nogpgcheck -y install" function ensure_cmd_or_install_package_apt(){ local cmd=$1 - local pkg=$2 + shift + local pkg=$* hash $cmd 2>/dev/null || ( apt-get-update && apt-get-install $pkg ) } function ensure_cmd_or_install_package_yum(){ local cmd=$1 - local pkg=$2 + shift + local pkg=$* hash $cmd 2>/dev/null || yum-install $pkg }