Merge commit 'dkg/master'

[monkeysphere.git] / packaging / freebsd / pkg-install

diff --git a/packaging/freebsd/pkg-install b/packaging/freebsd/pkg-install
index 940b7963eee074937e91fc6734e09bc35f457ddc..d7e4dbec95acffd9ab5c7387975f29906f1b4760 100755 (executable)
--- a/packaging/freebsd/pkg-install
+++ b/packaging/freebsd/pkg-install
@@ -15,6 +15,7 @@
 # MySQL puts its data in /var/db/mysql
 
 VARLIB="/var/monkeysphere"
+ETCDIR="/usr/local/etc/monkeysphere"
 
 case $2 in
 POST-INSTALL)
@@ -24,7 +25,7 @@ POST-INSTALL)
         GID=${UID}
         SHELL=/usr/local/bin/bash
 
-        if pw group show "${GROUP}" 2>/dev/null; then
+        if pw group show "${GROUP}" >/dev/null 2>&1; then
                 echo "You already have a group \"${GROUP}\", so I will use it."
         else
                 if pw groupadd ${GROUP} -g ${GID}; then
@@ -35,7 +36,8 @@ POST-INSTALL)
                 fi
         fi
 
-        if oldshell=`pw user show "${USER}" 2>/dev/null`; then
+       if pw user show "${USER}" >/dev/null 2>&1; then
+            oldshell=`pw user show "${USER}" 2>/dev/null | cut -f10 -d:`
            if [ x"$oldshell" != x"$SHELL" ]; then
                echo "You already have a \"${USER}\" user, but its shell is '$oldshell'."
                echo "This package requires that \"${USER}\"'s shell be '$SHELL'."
@@ -55,20 +57,14 @@ POST-INSTALL)
                 fi
         fi
 
-       ## set up the cache directories:
+       ## set up the cache directories, and link them to the config files:
 
        install -d -o root -g monkeysphere -m 750 "$VARLIB"/gnupg-host
-       cat <<EOF > "$VARLIB"/gnupg-host/gpg.conf
-list-options show-uid-validity
-EOF
+       ln -sf "$ETCDIR"/gnupg-host.conf  "$VARLIB"/gnupg-host/gpg.conf
 
        install -d -o monkeysphere -g monkeysphere -m 700 "$VARLIB"/gnupg-authentication
-# install authentication gpg.conf
-       cat <<EOF > "$VARLIB"/gnupg-authentication/gpg.conf
-list-options show-uid-validity
-primary-keyring $VARLIB/gnupg-authentication/pubring.gpg
-keyring $VARLIB/gnupg-host/pubring.gpg
-EOF
+       ln -sf "$ETCDIR"/gnupg-authentication.conf  "$VARLIB"/gnupg-authentication/gpg.conf
+
        chown monkeysphere:monkeysphere "$VARLIB"/gnupg-authentication/gpg.conf
 
        monkeysphere-server diagnostics