Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2025-04-04 16:51:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix PATH for cryptsetup when user does not have /sbin in it.

Browse Source
This commit is contained in:
hellekin 2011-11-25 09:00:47 +01:00
parent 0de65418da
commit 27c1ca2490
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -79,7 +79,7 @@ dnl these are not *build* dependencies, but *runtime* dependencies.
dnl Mandatory dnl Mandatory
AC_CHECK_PROG(have_zsh,zsh,yes,no) AC_CHECK_PROG(have_zsh,zsh,yes,no)
AC_CHECK_PROG(have_cryptsetup,cryptsetup,yes,no) AC_CHECK_PROG(have_cryptsetup,cryptsetup,yes,no,[/sbin$PATH_SEPARATOR/usr/local/sbin$PATH_SEPARATOR$PATH])
AC_CHECK_PROG(have_pinentry,pinentry,yes,no) AC_CHECK_PROG(have_pinentry,pinentry,yes,no)
AC_CHECK_PROG(have_sudo,sudo,yes,no) AC_CHECK_PROG(have_sudo,sudo,yes,no)
dnl Optional dnl Optional

4
src/tomb
View File

@ -37,6 +37,10 @@ DEBUG=0
typeset -A global_opts typeset -A global_opts
typeset -A opts typeset -A opts
# Set a sensible PATH
PATH=/sbin:/bin:/usr/sbin:/usr/bin
[[ "$TOMBEXEC" =~ "^/usr/local" ]] && PATH="/usr/local/bin:/usr/local/sbin:$PATH"
# PATH=/usr/bin:/usr/sbin:/bin:/sbin # PATH=/usr/bin:/usr/sbin:/bin:/sbin
# }}} # }}}
# {{{ HELPER FUNCTIONS # {{{ HELPER FUNCTIONS