Remove dependency on user's .profile

We no longer need to overwrite .profile with our settings.

5 files changed, 19 insertions, 25 deletions

diff --git a/packaging/macos/020-vars.sh b/packaging/macos/020-vars.sh
index fe11e6c55..df8dc2e84 100644
--- a/packaging/macos/020-vars.sh
+++ b/packaging/macos/020-vars.sh
@@ -11,13 +11,6 @@
 
 [ -z $VARS_INCLUDED ] && VARS_INCLUDED=true || return   # include guard
 
-### source .profile ############################################################
-
-# This is necessary on the first run and after changing directory settings.
-# So, we're better safe than sorry and source it.
-
-[ -f $HOME/.profile ] && source $HOME/.profile
-
 ### name and directory #########################################################
 
 SELF_NAME=$(basename $0)
@@ -166,3 +159,10 @@ PYTHON_PYGOBJECT=PyGObject==3.32.2
 PYTHON_SCOUR=scour==0.37
 PYTHON_PYSERIAL=pyserial==3.4
 
+### profile ####################################################################
+
+# Settings that would otherwise go into '.profile'.
+
+export PATH=$DEVPREFIX/bin:$BIN_DIR:/usr/bin:/bin:/usr/sbin:/sbin
+export LANG=de_DE.UTF-8   # jhbuild complains otherwise   FIXME hard-coded value
+
diff --git a/packaging/macos/110-sysprep.sh b/packaging/macos/110-sysprep.sh
index bfec0311e..fd569fcd9 100755
--- a/packaging/macos/110-sysprep.sh
+++ b/packaging/macos/110-sysprep.sh
@@ -22,7 +22,7 @@ if $RAMDISK_ENABLE; then
   create_ramdisk $WRK_DIR $RAMDISK_SIZE
 fi
 
-### housekeeping: redirect to locations below WRK_DIR ##########################
+### redirect to locations below WRK_DIR ########################################
 
 mkdir -p $TMP_DIR
 
@@ -32,11 +32,3 @@ ln -sf $TMP_DIR $HOME/.cache
 rm -rf $HOME/.local   # used by gtk-mac-bundler
 ln -sf $OPT_DIR $HOME/.local
 
-### setup path #################################################################
-
-# WARNING: Operations like this are the reason why you're supposed to use
-# a dedicated user for building.
-
-echo "export PATH=$DEVPREFIX/bin:$BIN_DIR:/usr/bin:/bin:/usr/sbin:/sbin" > $HOME/.profile
-echo "export LANG=de_DE.UTF-8" >> $HOME/.profile   # jhbuild complains otherwise
-
diff --git a/packaging/macos/220-inkscape-package.sh b/packaging/macos/220-inkscape-package.sh
index 6873f08db..fbc7b090c 100755
--- a/packaging/macos/220-inkscape-package.sh
+++ b/packaging/macos/220-inkscape-package.sh
@@ -34,8 +34,10 @@ mkdir -p $ARTIFACT_DIR
 
   cat <<EOF >$SRC_DIR/run_gtk-mac-bundler.sh
 #!/usr/bin/env bash
-export ARTIFACT_DIR=$ARTIFACT_DIR
-cd $BUILD_DIR
+SCRIPT_DIR=$SELF_DIR
+for script in \$SCRIPT_DIR/0??-*.sh; do source \$script; done
+export ARTIFACT_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 053f542ef..7190ce83b 100755
--- a/packaging/macos/230-inkscape-distrib.sh
+++ b/packaging/macos/230-inkscape-distrib.sh
@@ -39,9 +39,9 @@ convert -size 560x400 xc:transparent \
 
 cat <<EOF >$SRC_DIR/run_dmgbuild.sh
 #!/usr/bin/env bash
-SELF_DIR=$SELF_DIR
-for script in $SELF_DIR/0??-*.sh; do source \$script; done
-create_dmg $ARTIFACT_DIR/Inkscape.app $TMP_DIR/Inkscape.dmg $SRC_DIR/inkscape_dmg.py
+SCRIPT_DIR=$SELF_DIR
+for script in \$SCRIPT_DIR/0??-*.sh; do source \$script; done
+create_dmg \$ARTIFACT_DIR/Inkscape.app \$TMP_DIR/Inkscape.dmg \$SRC_DIR/inkscape_dmg.py
 EOF
 
 chmod 755 $SRC_DIR/run_dmgbuild.sh
diff --git a/packaging/macos/README.md b/packaging/macos/README.md
index a0d5dff6a..ab8e9ef88 100644
--- a/packaging/macos/README.md
+++ b/packaging/macos/README.md
@@ -7,9 +7,10 @@ This folder contains the scripts that make up the build pipeline for Inkscape on
 _These requirements have changed a few times over the course of development. So it would be more fair to call them "recommendations" instead, but I want to emphasize the importance of sticking to a known-good setup because of the huge number of moving parts involved._
 
 - __A clean environment is key__. Ideally, you'd have a __dedicated, clean macOS installation__ (as in "freshly installed + Xcode") available as build machine.
-  - Make sure there are no remnants from other build environments (e.g. MacPorts, Fink, Homebrew) on your system. Rule of thumb: clear out `/usr/local`.
+  - Make sure there are no remnants from other build environments (e.g. MacPorts, Fink, Homebrew) on your system.  
+    Rule of thumb: clear out `/usr/local`.
   - macOS 10.14.6 with Xcode 10.3.
-  - OS X Mavericks 10.9 SDK from Xcode 6.4
+  - OS X Mavericks 10.9 SDK from Xcode 6.4  
     `/Library/Developer/CommandLineTools/SDKs/MacOSX10.9.sdk`
 
 - __Use a dedicated user account__ unless you're prepared that these scripts will delete and overwrite your data in the following locations:  
@@ -19,7 +20,6 @@ _(based on default configuration)_
     $HOME/.cache               # will be removed, then linked to $TMP_DIR
     $HOME/.config/jhbuildrc*   # will be removed, then linked to $DEVCONFIG
     $HOME/.local               # will be removed, then linked to $OPT_DIR
-    $HOME/.profile             # will be overwritten
     ```
 
 - __16 GiB RAM__, since we're using a 9 GiB ramdisk to build everything.
@@ -32,7 +32,7 @@ _(based on default configuration)_
 
   - The build environment takes up ~6.1 GiB of disk space, the rest is buffer to be used during compilation and packaging. Subject to change and YMMV.
 
-  - If you only want to build Inkscape and not the build environment itself, a 5 GiB ramdisk is sufficient.
+  - If you only want to build Inkscape and not the build environment itself, a 5 GiB ramdisk is sufficient. (Not all of the tarball's content is extracted.)
 
 - somewhat decent __internet connection__ for all the downloads