--- data/dconf/make-dconf-override-db.sh.orig   2019-08-07 03:33:23 UTC
+++ data/dconf/make-dconf-override-db.sh
@@ -6,7 +6,7 @@
 # breaks dbus-launch.  There's dbus-run-session which is
 # better, but not everyone has it yet.
 export DBUS_FATAL_WARNINGS=0
-export TMPDIR=$(mktemp -d --tmpdir="$PWD")
+export TMPDIR=$(TMPDIR="${PWD}" mktemp -d)
 export XDG_CONFIG_HOME="$TMPDIR/config"
 export XDG_CACHE_HOME="$TMPDIR/cache"
 export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas"
@@ -49,7 +49,10 @@
 # via systemd since gvfs 1.45.90 in Fedora 33
 # and rm $TMPDIR could be failed until umount would be called.
 if [ -d $TMPDIR/cache/gvfs ] ; then
+  lc=`df | grep -c $TMPDIR/cache/gvfs | cat`
+  if [ $lc != 0 ] ; then
     umount $TMPDIR/cache/gvfs
+  fi
 fi
 rm -rf $TMPDIR
 
