Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #945 from nacx/scriptbuilder-install 

Improved setupPublicCurl script
This commit is contained in:
Adrian Cole 2012-11-05 11:30:44 -08:00
parent 1ff91e508d 652bc2f75e
commit 6eb0cd197f
6 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compute/src/test/resources/initscript_with_java.sh
View File

@ -89,14 +89,16 @@ alias yum-install="yum --quiet --nogpgcheck -y install"
function ensure_cmd_or_install_package_apt(){ function ensure_cmd_or_install_package_apt(){
local cmd=$1 local cmd=$1
local pkg=$2 shift
local pkg=$*
hash $cmd 2>/dev/null || ( apt-get-update && apt-get-install $pkg ) hash $cmd 2>/dev/null || ( apt-get-update && apt-get-install $pkg )
} }
function ensure_cmd_or_install_package_yum(){ function ensure_cmd_or_install_package_yum(){
local cmd=$1 local cmd=$1
local pkg=$2 shift
local pkg=$*
hash $cmd 2>/dev/null || yum-install $pkg hash $cmd 2>/dev/null || yum-install $pkg
} }

6
compute/src/test/resources/initscript_with_jetty.sh
View File

@ -89,14 +89,16 @@ alias yum-install="yum --quiet --nogpgcheck -y install"
function ensure_cmd_or_install_package_apt(){ function ensure_cmd_or_install_package_apt(){
local cmd=$1 local cmd=$1
local pkg=$2 shift
local pkg=$*
hash $cmd 2>/dev/null || ( apt-get-update && apt-get-install $pkg ) hash $cmd 2>/dev/null || ( apt-get-update && apt-get-install $pkg )
} }
function ensure_cmd_or_install_package_yum(){ function ensure_cmd_or_install_package_yum(){
local cmd=$1 local cmd=$1
local pkg=$2 shift
local pkg=$*
hash $cmd 2>/dev/null || yum-install $pkg hash $cmd 2>/dev/null || yum-install $pkg
} }

6
compute/src/test/resources/runscript.sh
View File

@ -89,14 +89,16 @@ alias yum-install="yum --quiet --nogpgcheck -y install"
function ensure_cmd_or_install_package_apt(){ function ensure_cmd_or_install_package_apt(){
local cmd=$1 local cmd=$1
local pkg=$2 shift
local pkg=$*
hash $cmd 2>/dev/null || ( apt-get-update && apt-get-install $pkg ) hash $cmd 2>/dev/null || ( apt-get-update && apt-get-install $pkg )
} }
function ensure_cmd_or_install_package_yum(){ function ensure_cmd_or_install_package_yum(){
local cmd=$1 local cmd=$1
local pkg=$2 shift
local pkg=$*
hash $cmd 2>/dev/null || yum-install $pkg hash $cmd 2>/dev/null || yum-install $pkg
} }

6
scriptbuilder/src/main/resources/functions/setupPublicCurl.sh
View File

@ -4,14 +4,16 @@ alias yum-install="yum --quiet --nogpgcheck -y install"
function ensure_cmd_or_install_package_apt(){ function ensure_cmd_or_install_package_apt(){
local cmd=$1 local cmd=$1
local pkg=$2 shift
local pkg=$*
hash $cmd 2>/dev/null || ( apt-get-update && apt-get-install $pkg ) hash $cmd 2>/dev/null || ( apt-get-update && apt-get-install $pkg )
} }
function ensure_cmd_or_install_package_yum(){ function ensure_cmd_or_install_package_yum(){
local cmd=$1 local cmd=$1
local pkg=$2 shift
local pkg=$*
hash $cmd 2>/dev/null || yum-install $pkg hash $cmd 2>/dev/null || yum-install $pkg
} }

6
scriptbuilder/src/test/resources/test_install_git_scriptbuilder.sh
View File

@ -89,14 +89,16 @@ alias yum-install="yum --quiet --nogpgcheck -y install"
function ensure_cmd_or_install_package_apt(){ function ensure_cmd_or_install_package_apt(){
local cmd=$1 local cmd=$1
local pkg=$2 shift
local pkg=$*
hash $cmd 2>/dev/null || ( apt-get-update && apt-get-install $pkg ) hash $cmd 2>/dev/null || ( apt-get-update && apt-get-install $pkg )
} }
function ensure_cmd_or_install_package_yum(){ function ensure_cmd_or_install_package_yum(){
local cmd=$1 local cmd=$1
local pkg=$2 shift
local pkg=$*
hash $cmd 2>/dev/null || yum-install $pkg hash $cmd 2>/dev/null || yum-install $pkg
} }

6
scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh
View File

@ -89,14 +89,16 @@ alias yum-install="yum --quiet --nogpgcheck -y install"
function ensure_cmd_or_install_package_apt(){ function ensure_cmd_or_install_package_apt(){
local cmd=$1 local cmd=$1
local pkg=$2 shift
local pkg=$*
hash $cmd 2>/dev/null || ( apt-get-update && apt-get-install $pkg ) hash $cmd 2>/dev/null || ( apt-get-update && apt-get-install $pkg )
} }
function ensure_cmd_or_install_package_yum(){ function ensure_cmd_or_install_package_yum(){
local cmd=$1 local cmd=$1
local pkg=$2 shift
local pkg=$*
hash $cmd 2>/dev/null || yum-install $pkg hash $cmd 2>/dev/null || yum-install $pkg
} }