diff options
| author | Bryan McLellan <btm@loftninjas.org> | 2015-12-17 08:51:05 -0500 |
|---|---|---|
| committer | Bryan McLellan <btm@loftninjas.org> | 2015-12-17 08:51:05 -0500 |
| commit | 994122529ad650f67daaebe50b6a47688665f96f (patch) | |
| tree | c4f5f85689de0986a3e6164f948418090d20104f | |
| parent | 22f86f158b7ff405ef5f8fddf7bddc3f4ff5111f (diff) | |
| parent | 8a7997d5c2dfb126fdd2df180e00399340b51232 (diff) | |
| download | chef-994122529ad650f67daaebe50b6a47688665f96f.tar.gz | |
Merge pull request #568 from chef/btm/fix-postinst
fix verify-chef.sh for freebsd + repin dance for release
| -rwxr-xr-x | jenkins/verify-chef.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/jenkins/verify-chef.sh b/jenkins/verify-chef.sh index 4143e639a4..4e60b1fd9f 100755 --- a/jenkins/verify-chef.sh +++ b/jenkins/verify-chef.sh @@ -23,23 +23,23 @@ 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 +# solaris doesn't have readlink or test -e. ls -n is different on BSD. proceed with caution. +if [ ! -L $USR_BIN_DIR/chef-client ] || [ `ls -l $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 [ ! -L $USR_BIN_DIR/knife ] || [ `ls -n $USR_BIN_DIR/knife | awk '{print$NF}'` != "$BIN_DIR/knife" ]; then +if [ ! -L $USR_BIN_DIR/knife ] || [ `ls -l $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 [ ! -L $USR_BIN_DIR/chef-solo ] || [ `ls -n $USR_BIN_DIR/chef-solo | awk '{print$NF}'` != "$BIN_DIR/chef-solo" ]; then +if [ ! -L $USR_BIN_DIR/chef-solo ] || [ `ls -l $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 [ ! -L $USR_BIN_DIR/ohai ] || [ `ls -n $USR_BIN_DIR/ohai | awk '{print$NF}'` != "$BIN_DIR/ohai" ]; then +if [ ! -L $USR_BIN_DIR/ohai ] || [ `ls -l $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 |