From a96ffb6b5d96d21be1d5bfa8181d3aeb71da547c Mon Sep 17 00:00:00 2001 From: B Stack Date: Fri, 2 Oct 2020 13:50:31 -0400 Subject: fix for devuan apparently UID is not transmitted everywhere, and also add some dependencies. --- debian/control | 4 +++- src/usr/bin/myautomount-trayicon | 1 + src/usr/bin/myautomountd | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index dd833f5..a35bf6d 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,9 @@ Package: myautomount Architecture: all Multi-Arch: foreign Depends: ${misc:Depends}, ${shlibs:Depends}, - python3:any + autofs, + python3:any, + python3-pyinotify Description: automount removable media Myautomount provides a daemon and tray icon that make your removable media easily accessible. diff --git a/src/usr/bin/myautomount-trayicon b/src/usr/bin/myautomount-trayicon index d6ccc9f..7760a56 100755 --- a/src/usr/bin/myautomount-trayicon +++ b/src/usr/bin/myautomount-trayicon @@ -1,5 +1,6 @@ #!/bin/sh # Part of myautomount project +test -z "${UID}" && export UID="$( $( which id ) -u "${USER}" )" . ${MYA_PREFIX}/etc/myautomount.conf MYA_USER_CFG="${XDG_CONFIG_HOME:-${HOME}/.config}/myautomount.conf" test -r "${MYA_USER_CFG}" && . "${MYA_USER_CFG}" diff --git a/src/usr/bin/myautomountd b/src/usr/bin/myautomountd index 06bb2da..0cbfb1f 100755 --- a/src/usr/bin/myautomountd +++ b/src/usr/bin/myautomountd @@ -115,6 +115,7 @@ createEntry() { } # INITIALIZE +test -z "${UID}" && export UID="$( $( which id ) -u "${USER}" )" . ${MYA_PREFIX}/etc/myautomount.conf trap '__ec=$? ; clean_automount ; trap "" 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 18 19 20 ; exit ${__ec} ;' 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 18 19 20 mkdir -p "${AUTOMOUNT_BASEDIR}" -- cgit