diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2014-10-24 05:02:54 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2014-10-24 05:02:54 +0000 |
| commit | 0db4cbaf98839c2c36c312efb10a1736f7736d43 (patch) | |
| tree | e094c4ad8abc9e8b4660ce6f5ad9c03ea3dabdf6 /packaging/macosx/ScriptExec | |
| parent | Initial removal of box3d outdated GTKish macros. (diff) | |
| parent | Update for osx packaging (re merge review by bryce) (diff) | |
| download | inkscape-0db4cbaf98839c2c36c312efb10a1736f7736d43.tar.gz inkscape-0db4cbaf98839c2c36c312efb10a1736f7736d43.zip | |
Update for osx packaging (re merge review by bryce):
- remove shebang from sourced shell scripts
- refactor how to restore original shell environment for external
apps launched via wrapper scripts
- remove python wrapper script
(mostly used as demo and for testing bundled python modules)
- update script to create stock icon theme
(glib 2.42.0 fixed broken icon lookup for generic folders)
- re-enable menu icons (based on user requests)
(bzr r13635)
Diffstat (limited to 'packaging/macosx/ScriptExec')
| -rwxr-xr-x | packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh b/packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh index d449b5121..05ffbe5c8 100755 --- a/packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh +++ b/packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh @@ -7,6 +7,12 @@ # ~suv <suv-sf@users.sourceforge.net> # +get_env_current () +{ + env | awk -F= '/[a-zA-Z_][a-zA-Z_0-9]*=/ {if (!system("[ -n \"${" $1 "+y}\" ]")) print $1 }' | sort | uniq +} +[ -z "$_env_orig" ] && export _env_orig="$(get_env_current)" + [ -n "$INK_DEBUG_LAUNCHER" ] && set -x CWD="$(cd "$(dirname "$0")" && pwd)" @@ -23,7 +29,7 @@ source "${TOP}/alert_fccache.sh" # path hack in src/path-prefix.h for osxapp-enabled builds). Until then, below change # of working directory is required: # -# Due to changes after 0.48, we have change working directory in the script named 'inkscape': +# Due to changes after 0.48, we have to change working directory in the script named 'inkscape': # recursive calls to inkscape from python-based extensions otherwise cause the app to hang or # fail (for python-based extensions, inkscape changes the working directory to the # script's directory, and inkscape launched by python script thus can't find resources |