GROUP=${USER}
UID=641
GID=${UID}
+ SHELL=/usr/local/bin/bash
if pw group show "${GROUP}" 2>/dev/null; then
echo "You already have a group \"${GROUP}\", so I will use it."
fi
fi
- if pw user show "${USER}" 2>/dev/null; then
- echo "You already have a user \"${USER}\", so I will use it."
+ if oldshell=`pw user show "${USER}" 2>/dev/null`; then
+ 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'."
+ echo "You should fix this by hand and then re-install the package."
+ echo " hint: pw usermod '$USER' -s '$SHELL'"
+ exit 1
+ fi
+ echo "You already have a user \"${USER}\" with the proper shell, so I will use it."
else
if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
- -d "$VARLIB" -s /sbin/sh -c "monkeysphere authentication user,,,"
+ -d "$VARLIB" -s /usr/local/bin/bash -c "monkeysphere authentication user,,,"
then
echo "Added user \"${USER}\"."
else
## set up the cache directories:
- install --owner root --group monkeysphere --mode 750 -d "$VARLIB"/gnupg-host
+ install -d -o root -g monkeysphere -m 750 "$VARLIB"/gnupg-host
cat <<EOF > "$VARLIB"/gnupg-host/gpg.conf
list-options show-uid-validity
EOF
- install --owner monkeysphere --group monkeysphere --mode 700 -d "$VARLIB"/gnupg-authentication
+ 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
EOF
chown monkeysphere:monkeysphere "$VARLIB"/gnupg-authentication/gpg.conf
+ monkeysphere-server diagnostics
;;
esac