Small fixes of the bundling script

Change-Id: I7fb8229bfa927f2f560ae45c39e32db516897363
diff --git a/make-osx-bundle.py b/make-osx-bundle.py
index fe46c7d..536d841 100755
--- a/make-osx-bundle.py
+++ b/make-osx-bundle.py
@@ -175,7 +175,7 @@
           self.handle_binary_libs(abs)
 
         os.chmod(macho, 0755)
-        print 'install_name_tool -change "%s" "@executable_path/../Frameworks/%s" "%s"' % (lib, rel, macho)
+        # print 'install_name_tool -change "%s" "@executable_path/../Frameworks/%s" "%s"' % (lib, rel, macho)
         os.system('install_name_tool -change "%s" "@executable_path/../Frameworks/%s" "%s"' % (lib, rel, macho))
 
       # Regular dylibs
@@ -198,7 +198,7 @@
           self.handled_libs[basename] = True
           self.handle_binary_libs(abs, loader_path=os.path.dirname(lib) if loader_path is None else loader_path)
 
-        print 'install_name_tool -change "%s" "@executable_path/../Frameworks/%s" "%s"' % (lib, rel, macho)
+        # print 'install_name_tool -change "%s" "@executable_path/../Frameworks/%s" "%s"' % (lib, rel, macho)
         os.chmod(macho, 0755)
         os.system('install_name_tool -change "%s" "@executable_path/../Frameworks/%s" "%s"' % (lib, rel, macho))
 
@@ -329,7 +329,8 @@
     '''
     print ' * Creating disk image. Please wait...'
     if os.path.exists(self.filename):
-      shutil.rmtree(self.filename)
+      os.remove(self.filename)
+      shutil.rmtree(self.filename, ignore_errors=True)
     p = Popen(['hdiutil', 'create',
               '-srcfolder', self.tmp,
               '-format', 'UDBZ',