diff --git a/Tools/Steam/ContentBuilder/builder_osx/crashhandler.dylib b/Tools/Steam/ContentBuilder/builder_osx/crashhandler.dylib index 48305dbe..a6b12f76 100755 Binary files a/Tools/Steam/ContentBuilder/builder_osx/crashhandler.dylib and b/Tools/Steam/ContentBuilder/builder_osx/crashhandler.dylib differ diff --git a/Tools/Steam/ContentBuilder/builder_osx/steamcmd b/Tools/Steam/ContentBuilder/builder_osx/steamcmd index 6bcec72f..098a5052 100755 Binary files a/Tools/Steam/ContentBuilder/builder_osx/steamcmd and b/Tools/Steam/ContentBuilder/builder_osx/steamcmd differ diff --git a/Tools/steam_publish.py b/Tools/steam_publish.py index 1ce991c3..05bfec4b 100644 --- a/Tools/steam_publish.py +++ b/Tools/steam_publish.py @@ -70,6 +70,9 @@ def publish( config_content = file.read() git_hash = get_git_revision_short_hash().decode("utf-8").replace("\n", "") git_commit_text = get_git_commit_text().decode("utf-8").replace("\n", "") + # Remove ' and " that can occour it is a merge commit + git_commit_text = git_commit_text.replace('\"','') + git_commit_text = git_commit_text.replace('\'','') current_date_time = datetime.now().strftime("%d/%m/%Y, %H:%M:%S") build_description = "- git hash: " + git_hash + ", commit: " + git_commit_text + " - upload datetime: " + current_date_time