summarylogtreecommitdiffstats
path: root/notepadpp
diff options
context:
space:
mode:
authorRenato Molnar2021-02-01 00:50:24 +0100
committerRenato Molnar2021-02-01 00:50:24 +0100
commit9787e55c095cb1a929edc143fe741c84138bbc6b (patch)
tree6a7212ceef2c73d5691dff2cc8eef192ea9119cb /notepadpp
parent642fd8169b31b4cdba96e45f4abb4d098d443654 (diff)
downloadaur-9787e55c095cb1a929edc143fe741c84138bbc6b.tar.gz
Bump version to 7.9.2
Diffstat (limited to 'notepadpp')
-rw-r--r--notepadpp18
1 files changed, 12 insertions, 6 deletions
diff --git a/notepadpp b/notepadpp
index 723c5e9b8147..d3ce6b11b246 100644
--- a/notepadpp
+++ b/notepadpp
@@ -7,24 +7,30 @@ localdir="${HOME}/.local/share/${app_name}"
configdir="${HOME}/.config/${app_name}"
cachedir="${HOME}/.cache/${app_name}"
-unset WINEPREFIX
-
for folder in "${localdir}" "${cachedir}" "${configdir}"; do
if [ ! -d "${folder}" ]; then
mkdir -p "${folder}"
fi
done
+cleanup() {
+ umount "${localdir}"
+}
+
if mount | grep -q "${localdir}"; then
- echo "${app_name} already mounted"
-elif ! fuse-overlayfs -o lowerdir="${pkgdir}" -o upperdir="${configdir}" -o workdir="${cachedir}" "${localdir}"; then
+ cleanup
+fi
+
+if ! fuse-overlayfs -o lowerdir="${pkgdir}" -o upperdir="${configdir}" -o workdir="${cachedir}" "${localdir}"; then
echo "ERROR: cannot mount fuse-overlayfs for ${app_name}"
exit 1
fi
+trap 'cleanup' INT TERM EXIT
+
if [ -n "${1}" ]; then
argpath="Z:\\$(readlink -f "${1}" | sed 's|/|\\\\|g')"
fi
-WINEDEBUG=-all exec wine "${localdir}/${app_name}" "${args}${argpath}"
-
+unset WINEPREFIX
+WINEDLLOVERRIDES="${WINEDLLOVERRIDES};mscoree=d;mshtml=d" WINEDEBUG=-all wine "${localdir}/${app_name}" "${argpath}"