Skip to content

SG-38266 - WIP #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

SG-38266 - WIP #140

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9030b21
Revert #71
julien-lang Jun 24, 2025
e5888d1
fixup! Revert #71
julien-lang Jun 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions python/shotgun_desktop/startup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,6 @@
# initialize logging
import logging

# The value of sys.executable under multiple platforms and multiple versions
# of Desktop is unreliable. Therefore, we're patch the value if the executable
# name is not Shotgun or ShotGrid.
#
# So, we'll use sys.prefix which is properly set and backtrack to the executable.
# When the executable is fixed we should come back here and put a check for the version
# number so we stop updating sys.executable

# Grab the name and the executable
executable_name, ext = os.path.splitext(os.path.basename(sys.executable or ""))

# If the executable is not named Shotgun or ShotGrid, then we need to patch sys.executable.
if executable_name.lower() not in ["shotgun", "shotgrid"]:
# On macOS, sys.prefix is set to /Applications/Shotgun.app/Contents/Resources/python,
# so we need to drill down differently for the executable folder than on other platforms
if sys.platform == "darwin":
bin_dir = os.path.join(sys.prefix, "..", "..", "MacOS")
else:
# On Linux and Windows, the sys.prefix points to Shotgun/Python, so we only
# need to move up one folder.
bin_dir = os.path.join(sys.prefix, "..")

# Set the executable name and make sure to put back in the extension for Windows.
sys.executable = os.path.normpath(os.path.join(bin_dir, "Shotgun%s" % ext))


def _enumerate_per_line(items):
"""
Expand Down