Merge pull request #4383 from chef/ksubrama/cleanup

Bringing in open PRs with +1s from omnibus-chef

8 files changed, 4 insertions, 16 deletions

diff --git a/omnibus/Berksfile b/omnibus/Berksfile
index acf0fa7389..72dcf108fe 100644
--- a/omnibus/Berksfile
+++ b/omnibus/Berksfile
@@ -1,4 +1,4 @@
-source 'https://api.berkshelf.com'
+source 'https://supermarket.chef.io'
 
 cookbook 'omnibus'
 
diff --git a/omnibus/package-scripts/angrychef/postinst b/omnibus/package-scripts/angrychef/postinst
index c0fc3f5525..a173efeaef 100755
--- a/omnibus/package-scripts/angrychef/postinst
+++ b/omnibus/package-scripts/angrychef/postinst
@@ -85,7 +85,6 @@ rm -f $PREFIX/bin/chef-solo
 rm -f $PREFIX/bin/chef-apply
 rm -f $PREFIX/bin/chef-shell
 rm -f $PREFIX/bin/knife
-rm -f $PREFIX/bin/shef
 rm -f $PREFIX/bin/ohai
 
 ln -sf $INSTALLER_DIR/bin/chef-solo $PREFIX/bin || error_exit "Cannot link chef-solo to $PREFIX/bin"
@@ -96,9 +95,6 @@ if [ -f "$INSTALLER_DIR/bin/chef-shell" ]; then
   ln -sf $INSTALLER_DIR/bin/chef-shell $PREFIX/bin || error_exit "Cannot link chef-shell to $PREFIX/bin"
 fi
 ln -sf $INSTALLER_DIR/bin/knife $PREFIX/bin || error_exit "Cannot link knife to $PREFIX/bin"
-if [ -f "$INSTALLER_DIR/bin/shef" ]; then
-  ln -sf $INSTALLER_DIR/bin/shef $PREFIX/bin || error_exit "Cannot link shef to $PREFIX/bin"
-fi
 ln -sf $INSTALLER_DIR/bin/ohai $PREFIX/bin || error_exit "Cannot link ohai to $PREFIX/bin"
 
 # We test for the presence of /usr/bin/chef-client to know if this script succeeds, so this
diff --git a/omnibus/package-scripts/angrychef/postrm b/omnibus/package-scripts/angrychef/postrm
index 724c082be7..247688074e 100755
--- a/omnibus/package-scripts/angrychef/postrm
+++ b/omnibus/package-scripts/angrychef/postrm
@@ -25,7 +25,7 @@ else
 fi
 
 cleanup_symlinks() {
-  binaries="chef-client chef-solo chef-apply chef-shell knife shef ohai"
+  binaries="chef-client chef-solo chef-apply chef-shell knife ohai"
   for binary in $binaries; do
     rm -f $PREFIX/bin/$binary
   done
diff --git a/omnibus/package-scripts/chef-fips/postinst b/omnibus/package-scripts/chef-fips/postinst
index 6f13382b61..8aa6f19ec1 100755
--- a/omnibus/package-scripts/chef-fips/postinst
+++ b/omnibus/package-scripts/chef-fips/postinst
@@ -85,7 +85,6 @@ rm -f $PREFIX/bin/chef-solo
 rm -f $PREFIX/bin/chef-apply
 rm -f $PREFIX/bin/chef-shell
 rm -f $PREFIX/bin/knife
-rm -f $PREFIX/bin/shef
 rm -f $PREFIX/bin/ohai
 
 ln -sf $INSTALLER_DIR/bin/chef-solo $PREFIX/bin || error_exit "Cannot link chef-solo to $PREFIX/bin"
@@ -96,9 +95,6 @@ if [ -f "$INSTALLER_DIR/bin/chef-shell" ]; then
   ln -sf $INSTALLER_DIR/bin/chef-shell $PREFIX/bin || error_exit "Cannot link chef-shell to $PREFIX/bin"
 fi
 ln -sf $INSTALLER_DIR/bin/knife $PREFIX/bin || error_exit "Cannot link knife to $PREFIX/bin"
-if [ -f "$INSTALLER_DIR/bin/shef" ]; then
-  ln -sf $INSTALLER_DIR/bin/shef $PREFIX/bin || error_exit "Cannot link shef to $PREFIX/bin"
-fi
 ln -sf $INSTALLER_DIR/bin/ohai $PREFIX/bin || error_exit "Cannot link ohai to $PREFIX/bin"
 
 # We test for the presence of /usr/bin/chef-client to know if this script succeeds, so this
diff --git a/omnibus/package-scripts/chef-fips/postrm b/omnibus/package-scripts/chef-fips/postrm
index 724c082be7..247688074e 100755
--- a/omnibus/package-scripts/chef-fips/postrm
+++ b/omnibus/package-scripts/chef-fips/postrm
@@ -25,7 +25,7 @@ else
 fi
 
 cleanup_symlinks() {
-  binaries="chef-client chef-solo chef-apply chef-shell knife shef ohai"
+  binaries="chef-client chef-solo chef-apply chef-shell knife ohai"
   for binary in $binaries; do
     rm -f $PREFIX/bin/$binary
   done
diff --git a/omnibus/package-scripts/chef/postinst b/omnibus/package-scripts/chef/postinst
index 88016f6c03..45893241b3 100755
--- a/omnibus/package-scripts/chef/postinst
+++ b/omnibus/package-scripts/chef/postinst
@@ -85,7 +85,6 @@ rm -f $PREFIX/bin/chef-solo
 rm -f $PREFIX/bin/chef-apply
 rm -f $PREFIX/bin/chef-shell
 rm -f $PREFIX/bin/knife
-rm -f $PREFIX/bin/shef
 rm -f $PREFIX/bin/ohai
 
 ln -sf $INSTALLER_DIR/bin/chef-solo $PREFIX/bin || error_exit "Cannot link chef-solo to $PREFIX/bin"
@@ -96,9 +95,6 @@ if [ -f "$INSTALLER_DIR/bin/chef-shell" ]; then
   ln -sf $INSTALLER_DIR/bin/chef-shell $PREFIX/bin || error_exit "Cannot link chef-shell to $PREFIX/bin"
 fi
 ln -sf $INSTALLER_DIR/bin/knife $PREFIX/bin || error_exit "Cannot link knife to $PREFIX/bin"
-if [ -f "$INSTALLER_DIR/bin/shef" ]; then
-  ln -sf $INSTALLER_DIR/bin/shef $PREFIX/bin || error_exit "Cannot link shef to $PREFIX/bin"
-fi
 ln -sf $INSTALLER_DIR/bin/ohai $PREFIX/bin || error_exit "Cannot link ohai to $PREFIX/bin"
 
 # We test for the presence of /usr/bin/chef-client to know if this script succeeds, so this
diff --git a/omnibus/package-scripts/chef/postrm b/omnibus/package-scripts/chef/postrm
index 724c082be7..247688074e 100755
--- a/omnibus/package-scripts/chef/postrm
+++ b/omnibus/package-scripts/chef/postrm
@@ -25,7 +25,7 @@ else
 fi
 
 cleanup_symlinks() {
-  binaries="chef-client chef-solo chef-apply chef-shell knife shef ohai"
+  binaries="chef-client chef-solo chef-apply chef-shell knife ohai"
   for binary in $binaries; do
     rm -f $PREFIX/bin/$binary
   done
diff --git a/omnibus/resources/chef/dmg/icon.png b/omnibus/resources/chef/dmg/icon.png
index b65c309660..2195d7c82a 100644
--- a/omnibus/resources/chef/dmg/icon.png
+++ b/omnibus/resources/chef/dmg/icon.png