Skip to content

Commit 600f96f

Browse files
committed
bundle pip and provide a user accessible link
1 parent ea6fd07 commit 600f96f

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

bundle.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ mv "$QL_OSXBUNDLE_BUNDLE_DEST/app.app" "$APP"
2222

2323
# launcher scripts
2424
mv "$APP"/Contents/MacOS/{gPodder,gpodder}
25-
CMDS="gpo gpodder-migrate2tres run-python"
25+
CMDS="gpo gpodder-migrate2tres run-python run-pip"
2626
for cmd in ${CMDS}; do
2727
cp -a "$APP"/Contents/MacOS/{gpodder,$cmd}
2828
if [ -e "$QL_OSXBUNDLE_BUNDLE_DEST/$cmd" ]; then

misc/bundle/gpodder.bundle

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,8 @@
112112
<data>${prefix}/lib/python3.8/ctypes</data>
113113
<data>${prefix}/lib/python3.8/curses</data>
114114
<!--<data>${prefix}/lib/python3.8/dbm</data>-->
115-
<!--<data>${prefix}/lib/python3.8/distutils</data>-->
116115
<data>${prefix}/lib/python3.8/email</data>
117116
<data>${prefix}/lib/python3.8/encodings</data>
118-
<!--<data>${prefix}/lib/python3.8/ensurepip</data>-->
119117
<data>${prefix}/lib/python3.8/html</data>
120118
<data>${prefix}/lib/python3.8/http</data>
121119
<!--<data>${prefix}/lib/python3.8/idlelib</data>-->
@@ -135,7 +133,6 @@
135133
<!--<data>${prefix}/lib/python3.8/venv</data>-->
136134
<data>${prefix}/lib/python3.8/wsgiref</data>
137135
<data>${prefix}/lib/python3.8/xml</data>
138-
<!--<data>${prefix}/lib/python3.8/xmlrpc</data>-->
139136

140137
<!-- only required extra modules (no dbus, for instance) -->
141138
<data>${prefix}/lib/python3.8/site-packages/podcastparser.py</data>
@@ -283,4 +280,11 @@
283280
<data dest="${bundle}/Contents/Resources">
284281
${project}/launcher.py
285282
</data>
283+
284+
<!-- pip support -->
285+
<data>${prefix}/bin/pip3*</data>
286+
<data>${prefix}/lib/python3.8/distutils</data>
287+
<data>${prefix}/lib/python3.8/site-packages/pip</data>
288+
<data>${prefix}/lib/python3.8/xmlrpc</data>
289+
<!--<data>${prefix}/lib/python3.8/ensurepip</data>-->
286290
</app-bundle>

misc/bundle/launcher.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,14 @@ def gpodder_home():
169169
args = [python_exe] + sys.argv[1:]
170170
# print("running", args)
171171
os.execv(python_exe, args)
172+
if app == 'run-pip':
173+
python_exe = os.path.join(bundle_contents, 'MacOS', 'python3')
174+
pip = os.path.join(bundle_contents, 'Resources', 'bin', 'pip3')
175+
# executable is repeated as argv[0].
176+
# Old sys.argv[0] points to Contents/MacOS so must be removed
177+
args = [python_exe, pip] + sys.argv[1:]
178+
# print("running", args)
179+
os.execv(python_exe, args)
172180
else:
173181
import runpy
174182
runpy.run_path(os.path.join(bundle_bin, app), run_name='__main__')

0 commit comments

Comments
 (0)