mirror of https://github.com/GNOME/gimp.git
tools: more portability fixes.
Apparently mktemp with busybox (and no GNU coreutils) requires mktemp template to be XXXXXX. Thanks to pippin for raising this issue.
This commit is contained in:
parent
4b25148269
commit
8344d7c331
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
export GIMP3_DIRECTORY=$(mktemp -d ${GIMP_GLOBAL_BUILD_ROOT}/.GIMP3-build-config-XXX)
|
export GIMP3_DIRECTORY=$(mktemp -d ${GIMP_GLOBAL_BUILD_ROOT}/.GIMP3-build-config-XXXXXX)
|
||||||
echo INFO: temporary GIMP configuration directory: $GIMP3_DIRECTORY
|
echo INFO: temporary GIMP configuration directory: $GIMP3_DIRECTORY
|
||||||
|
|
||||||
if [ -n "$GIMP_TEMP_UPDATE_RPATH" ]; then
|
if [ -n "$GIMP_TEMP_UPDATE_RPATH" ]; then
|
||||||
|
@ -52,7 +52,7 @@ if [ -n "$GIMP3_DIRECTORY" ] && [ -d "$GIMP3_DIRECTORY" ] && [ -O "$GIMP3_DIRECT
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
used_dir_prefix=$(realpath "$GIMP3_DIRECTORY")
|
used_dir_prefix=$(realpath "$GIMP3_DIRECTORY")
|
||||||
used_dir_prefix=${used_dir_prefix%???}
|
used_dir_prefix=${used_dir_prefix%??????}
|
||||||
tmpl_dir_prefix=$(realpath "$GIMP_GLOBAL_BUILD_ROOT")/.GIMP3-build-config-
|
tmpl_dir_prefix=$(realpath "$GIMP_GLOBAL_BUILD_ROOT")/.GIMP3-build-config-
|
||||||
if [ "$used_dir_prefix" != "$tmpl_dir_prefix" ]; then
|
if [ "$used_dir_prefix" != "$tmpl_dir_prefix" ]; then
|
||||||
echo "ERROR: \$GIMP3_DIRECTORY ($GIMP3_DIRECTORY) should be under the build directory with a specific prefix."
|
echo "ERROR: \$GIMP3_DIRECTORY ($GIMP3_DIRECTORY) should be under the build directory with a specific prefix."
|
||||||
|
|
Loading…
Reference in New Issue