diff options
| author | Jameson Rollins <jrollins@finestructure.net> | 2010-09-14 13:35:28 -0400 |
|---|---|---|
| committer | Jameson Rollins <jrollins@finestructure.net> | 2010-09-14 13:35:28 -0400 |
| commit | 5f0bc4c22cb351e6b51906a5febfd664130a2197 (patch) | |
| tree | 5e0a0a0900f9bac4e0f5a5dce1d654840d4370f8 /src/transitions | |
| parent | 2cbeae585d91f8d7571b33f7f47670267963a4e2 (diff) | |
fix *all* install paths, including in man pages and transition scripts
Diffstat (limited to 'src/transitions')
| -rwxr-xr-x | src/transitions/0.23 | 5 | ||||
| -rwxr-xr-x | src/transitions/0.28 | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/transitions/0.23 b/src/transitions/0.23 index 3964558..82529f2 100755 --- a/src/transitions/0.23 +++ b/src/transitions/0.23 @@ -20,8 +20,9 @@ # any unexpected errors should cause this script to bail: set -e -SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/lib/monkeysphere"} -SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/etc/monkeysphere"} +SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"__SYSSHAREDIR_PREFIX__/share/monkeysphere"} +export SYSSHAREDIR +. "${SYSSHAREDIR}/defaultenv" MADATADIR="${SYSDATADIR}/authentication" MHDATADIR="${SYSDATADIR}/host" diff --git a/src/transitions/0.28 b/src/transitions/0.28 index 5da6ab1..d21ec4e 100755 --- a/src/transitions/0.28 +++ b/src/transitions/0.28 @@ -16,7 +16,10 @@ # any unexpected errors should cause this script to bail: set -e -SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/lib/monkeysphere"} +SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"__SYSSHAREDIR_PREFIX__/share/monkeysphere"} +export SYSSHAREDIR +. "${SYSSHAREDIR}/defaultenv" + OLD_HOST_KEY_FILE="$SYSDATADIR"/ssh_host_rsa_key.pub.gpg if [ -f "$OLD_HOST_KEY_FILE" ] ; then |