extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-04-24 11:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

ui-macos: call the main binary MacOS/Sshuttle.

Browse Source 
That way we can 'killall Sshuttle' and so on, and it looks right in the
process list.
This commit is contained in:
Avery Pennarun 2011-01-22 16:35:31 -08:00
parent 522bc23854
commit d4ccd30c24
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-macos/Info.plist
View File

@ -7,7 +7,7 @@
<key>CFBundleDisplayName</key> <key>CFBundleDisplayName</key>
<string>Sshuttle VPN</string> <string>Sshuttle VPN</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>run</string> <string>Sshuttle</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>app.icns</string> <string>app.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>

3
ui-macos/bits/run
View File

@ -1,3 +0,0 @@
#!/bin/sh
cd "$(dirname "$0")"
exec ./runpython ../Resources/main.py

13
ui-macos/bits/runpython.c
View File

@ -7,8 +7,17 @@
* goes wrong if your interpreter is /usr/bin/python. * goes wrong if your interpreter is /usr/bin/python.
*/ */
#include <Python.h> #include <Python.h>
#include <string.h>
#include <unistd.h>
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
return Py_Main(argc, argv); char *path = strdup(argv[0]), *cptr;
} char *args[] = {argv[0], "../Resources/main.py", NULL};
cptr = strrchr(path, '/');
if (cptr)
*cptr = 0;
chdir(path);
free(path);
return Py_Main(2, args);
}

2
ui-macos/debug.app.do
View File

@ -9,7 +9,7 @@ ln -s ../../app.icns .
mkdir MacOS mkdir MacOS
cd MacOS cd MacOS
ln -s ../../../bits/runpython ../../../bits/run . ln -s ../../../bits/runpython Sshuttle
cd ../../.. cd ../../..
redo-ifchange $(find debug.app -type f) redo-ifchange $(find debug.app -type f)

4
ui-macos/default.app.do
View File

@ -1,6 +1,6 @@
TOP=$PWD TOP=$PWD
redo-ifchange sources.list redo-ifchange sources.list
redo-ifchange Info.plist bits/runpython bits/run \ redo-ifchange Info.plist bits/runpython \
$(while read name newname; do echo "$name"; done <sources.list) $(while read name newname; do echo "$name"; done <sources.list)
rm -rf "$1.app" rm -rf "$1.app"
@ -10,7 +10,7 @@ cd "$1.app/Contents"
cp "$TOP/Info.plist" . cp "$TOP/Info.plist" .
mkdir MacOS mkdir MacOS
cp "$TOP/bits/runpython" "$TOP/bits/run" MacOS/ cp "$TOP/bits/runpython" MacOS/Sshuttle
mkdir Resources mkdir Resources