projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generalize filesystem location variables (closes http://web.monkeysphere.info/bugs...
[monkeysphere.git]
/
src
/
monkeysphere
diff --git
a/src/monkeysphere
b/src/monkeysphere
index 089c06e6e8e59ac2e72e7df9e6613b4a0e53490e..1db4f20ce48fba8670aeb4507d4bed4b9ca0f853 100755
(executable)
--- a/
src/monkeysphere
+++ b/
src/monkeysphere
@@
-13,9
+13,9
@@
########################################################################
PGRM=$(basename $0)
########################################################################
PGRM=$(basename $0)
-S
HARE=${MONKEYSPHERE_SHARE
:-"/usr/share/monkeysphere"}
-export S
HARE
-. "${S
HARE
}/common" || exit 1
+S
YSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR
:-"/usr/share/monkeysphere"}
+export S
YSSHAREDIR
+. "${S
YSSHAREDIR
}/common" || exit 1
# UTC date in ISO 8601 format if needed
DATE=$(date -u '+%FT%T')
# UTC date in ISO 8601 format if needed
DATE=$(date -u '+%FT%T')
@@
-36,7
+36,7
@@
umask 077
usage() {
cat <<EOF >&2
usage: $PGRM <subcommand> [options] [args]
usage() {
cat <<EOF >&2
usage: $PGRM <subcommand> [options] [args]
-Monkey
S
phere client tool.
+Monkey
s
phere client tool.
subcommands:
update-known_hosts (k) [HOST]... update known_hosts file
subcommands:
update-known_hosts (k) [HOST]... update known_hosts file
@@
-270,7
+270,7
@@
unset HASH_KNOWN_HOSTS
unset AUTHORIZED_KEYS
# load global config
unset AUTHORIZED_KEYS
# load global config
-[ -r "${
ETC}/monkeysphere.conf" ] && . "${ETC
}/monkeysphere.conf"
+[ -r "${
SYSCONFIGDIR}/monkeysphere.conf" ] && . "${SYSCONFIGDIR
}/monkeysphere.conf"
# set monkeysphere home directory
MONKEYSPHERE_HOME=${MONKEYSPHERE_HOME:="${HOME}/.monkeysphere"}
# set monkeysphere home directory
MONKEYSPHERE_HOME=${MONKEYSPHERE_HOME:="${HOME}/.monkeysphere"}