diff options
| author | René de Hesselle <dehesselle@web.de> | 2019-09-12 23:38:10 +0000 |
|---|---|---|
| committer | René de Hesselle <dehesselle@web.de> | 2019-09-12 23:38:10 +0000 |
| commit | 5b8f8d2c7566d3a1c94c763e983c0c8a9b1f159a (patch) | |
| tree | ebb3d8f1608eef4f8f975d49fff283b2e052870b /packaging/macos | |
| parent | Remove dependency on user's .profile (diff) | |
| download | inkscape-5b8f8d2c7566d3a1c94c763e983c0c8a9b1f159a.tar.gz inkscape-5b8f8d2c7566d3a1c94c763e983c0c8a9b1f159a.zip | |
Fix packaging and distribution scripts
The previous commit was faulty. The run_in_terminal scripts in
steps 220 and 230 need to source in the configuration as every other
script. Dependencies on variables must be handled independently
from the main script.
Diffstat (limited to 'packaging/macos')
| -rw-r--r-- | packaging/macos/030-funcs.sh | 2 | ||||
| -rwxr-xr-x | packaging/macos/220-inkscape-package.sh | 1 | ||||
| -rwxr-xr-x | packaging/macos/230-inkscape-distrib.sh | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/packaging/macos/030-funcs.sh b/packaging/macos/030-funcs.sh index 85b2c7d6e..74254f164 100644 --- a/packaging/macos/030-funcs.sh +++ b/packaging/macos/030-funcs.sh @@ -274,7 +274,7 @@ function create_dmg local cfg=$3 # set application - sed "s/PLACEHOLDERAPPLICATION/$(escape_sed $app)/" $SELF_DIR/$(basename $cfg) > $cfg + sed -i '' "s/PLACEHOLDERAPPLICATION/$(escape_sed $app)/" $cfg # set disk image icon (if it exists) local icon=$SRC_DIR/$(basename -s .py $cfg).icns diff --git a/packaging/macos/220-inkscape-package.sh b/packaging/macos/220-inkscape-package.sh index fbc7b090c..a87e12fea 100755 --- a/packaging/macos/220-inkscape-package.sh +++ b/packaging/macos/220-inkscape-package.sh @@ -37,6 +37,7 @@ mkdir -p $ARTIFACT_DIR SCRIPT_DIR=$SELF_DIR for script in \$SCRIPT_DIR/0??-*.sh; do source \$script; done export ARTIFACT_DIR +BUILD_DIR=$BUILD_DIR cd \$BUILD_DIR jhbuild run gtk-mac-bundler inkscape.bundle EOF diff --git a/packaging/macos/230-inkscape-distrib.sh b/packaging/macos/230-inkscape-distrib.sh index 7190ce83b..931b663be 100755 --- a/packaging/macos/230-inkscape-distrib.sh +++ b/packaging/macos/230-inkscape-distrib.sh @@ -37,6 +37,8 @@ convert -size 560x400 xc:transparent \ # a separate script and be executed via Terminal.app. # See: https://github.com/al45tair/dmgbuild/pull/11 +cp $SELF_DIR/inkscape_dmg.py $SRC_DIR + cat <<EOF >$SRC_DIR/run_dmgbuild.sh #!/usr/bin/env bash SCRIPT_DIR=$SELF_DIR |