diff options
| author | Bryan McLellan <btm@chef.io> | 2015-12-16 16:45:26 -0800 |
|---|---|---|
| committer | Bryan McLellan <btm@chef.io> | 2015-12-16 16:45:26 -0800 |
| commit | fac832617dc4d0246e84177f5cc8732e306724c5 (patch) | |
| tree | 9b4b7360d3a2804d873455672560f1d5aef26e03 | |
| parent | d8a6df334c1d65e559a1a0da7ce693c5c4ee9136 (diff) | |
| download | chef-fac832617dc4d0246e84177f5cc8732e306724c5.tar.gz | |
solaris sh compatible verify-chef.sh
| -rwxr-xr-x | jenkins/verify-chef.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/jenkins/verify-chef.sh b/jenkins/verify-chef.sh index 4637aa6ec4..4143e639a4 100755 --- a/jenkins/verify-chef.sh +++ b/jenkins/verify-chef.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # $PROJECT_NAME is set by Jenkins, this allows us to use the same script to verify # Chef and Angry Chef @@ -23,6 +23,7 @@ fi export USR_BIN_DIR # sanity check that we're getting the correct symlinks from the pre-install script +# solaris doesn't have readlink or test -e. proceed with caution. 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 @@ -38,7 +39,7 @@ if [ ! -L $USR_BIN_DIR/chef-solo ] || [ `ls -n $USR_BIN_DIR/chef-solo | awk '{pr exit 1 fi -if [ ! -L $USR_BIN_DIR/chef-client ] || [ `ls -n $USR_BIN_DIR/ohai | awk '{print$NF}'` != "$BIN_DIR/ohai" ]; then +if [ ! -L $USR_BIN_DIR/ohai ] || [ `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 |