diff options
author | Bryan McLellan <btm@chef.io> | 2015-12-16 16:39:58 -0800 |
---|---|---|
committer | Bryan McLellan <btm@chef.io> | 2015-12-16 16:39:58 -0800 |
commit | d8a6df334c1d65e559a1a0da7ce693c5c4ee9136 (patch) | |
tree | 6b5a8fa995daebee568dbd2d46a3158b0ba3221e | |
parent | 81d8260401d9d4f9a0d5d6ba6ee4953a308b7303 (diff) | |
download | chef-d8a6df334c1d65e559a1a0da7ce693c5c4ee9136.tar.gz |
solaris sh compatible verify-chef.sh
-rwxr-xr-x | jenkins/verify-chef.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/jenkins/verify-chef.sh b/jenkins/verify-chef.sh index 9459c9efe6..4637aa6ec4 100755 --- a/jenkins/verify-chef.sh +++ b/jenkins/verify-chef.sh @@ -23,22 +23,22 @@ fi export USR_BIN_DIR # sanity check that we're getting the correct symlinks from the pre-install script -if [ `readlink $USR_BIN_DIR/chef-client` != "$BIN_DIR/chef-client" ]; then +if [ ! -L $USR_BIN_DIR/chef-client ] || [ `ls -n $USR_BIN_DIR/chef-client | awk '{print$NF}'` != "$BIN_DIR/chef-client" ]; then echo "$USR_BIN_DIR/chef-client symlink to $BIN_DIR/chef-client was not correctly created by the pre-install script!" exit 1 fi -if [ `readlink $USR_BIN_DIR/knife` != "$BIN_DIR/knife" ]; then +if [ ! -L $USR_BIN_DIR/knife ] || [ `ls -n $USR_BIN_DIR/knife | awk '{print$NF}'` != "$BIN_DIR/knife" ]; then echo "$USR_BIN_DIR/knife symlink to $BIN_DIR/knife was not correctly created by the pre-install script!" exit 1 fi -if [ `readlink $USR_BIN_DIR/chef-solo` != "$BIN_DIR/chef-solo" ]; then +if [ ! -L $USR_BIN_DIR/chef-solo ] || [ `ls -n $USR_BIN_DIR/chef-solo | awk '{print$NF}'` != "$BIN_DIR/chef-solo" ]; then echo "$USR_BIN_DIR/chef-solo symlink to $BIN_DIR/chef-solo was not correctly created by the pre-install script!" exit 1 fi -if [ `readlink $USR_BIN_DIR/ohai` != "$BIN_DIR/ohai" ]; then +if [ ! -L $USR_BIN_DIR/chef-client ] || [ `ls -n $USR_BIN_DIR/ohai | awk '{print$NF}'` != "$BIN_DIR/ohai" ]; then echo "$USR_BIN_DIR/ohai symlink to $BIN_DIR/ohai was not correctly created by the pre-install script!" exit 1 fi |